If your just doing heroics, you wont need the resto druid as resto, go boomkin and in a pinch just have the hybrids spot heal.

I would switch the mage for a destruction warlock. My recent experience with trying mage again has been dreadful, though I find arcane very pretty to look at.

I do most heroics with just a spot heal on trash while looting corpses, on bosses a emergency lesser healing wave / self dual chain heal might be needed. Likely a 'chew soul candy now!' will suffice quite a bit.