I would also recommend what Fur said - respec one shaman to Resto. They're awesome healers (Earth Shield rules my world ) and you can still dps on trash with them.

And regarding the def cap - 535 is enough for heroics since none of the bosses is lvl83.