Reroll warlock/mage for ranged. Warrior/DK/Monk for melee.
These classes actually were reworked and respond to feedback.