I also made a dwarf mage for this reason, all you see past 2200 is fucking DK/Feral teams. I prefer being able to have basically an Iceblock three times ^^
I don't think that going dwarf would be a terrible choice, but i can't really see how stoneform is gonna save you anyway. In my opinion the share amount of pressure you can put out with two offensive trinkets saves you more cooldowns.
I would say it all depends on what comp and what type of gameplay you enjoy. But both is fine, if you have huge troubles with surviving go dorf!