If you want to keep a WAR as a tank and desire a ROG as your DPS, I'd say bail the CLR and go SHM. The SHM can slow and heal. If you want to keep your CLR then you might consider a ENC for slows, haste, some DPS (I think - I've never played an ENC), and great CC. Or go WIZ which gives great DPS...