Another good option blending your original one and maintaining ranged is:

Warrior (tank)
Paladin
Priest
Mage
Hunter

So you still have 4 of 5 ranged (I like shockadins) but you can as an option go with a ret for some 2H action. Two plates, two cloth and a leather/mail wearer.