I think even classes like Shaman, Warlock and the Summoner will get you rid of your MP problems.