IMHO, I would choose a mage over a warlock. Intellect boost, portals, food, water, relatively simple CC if needed, and likely an easier class to macro in a mixed group since there isn't a pet. Warlock healthstones probably won't be very useful except in situations where all your toons consume them at once.