I'm in a similar situation. I'm farming heroic badges and trying to get some of my shammies into 25 mans when the opportunity arises. I'm sure when Ulduar opens there will be badge upgrades too.