Sorry to hear about the warlocks!

If it wasn't the pet aspect of Warocks that you disliked, Hunters may be worth a try. The druid healers on the pets would trivialize any sort of quest elite you had to worry about. If you disliked the pet aspect of Warlocks, then I probably wouldn't suggest that

You always have the Shaman option, or two more Druids.

What sort of playstyle are you looking for?