Thank you all for the comments!

Wizeowel- your point regarding the additional aura and blessings is a good one. The improved ret aura is so sweet. I do indeed use Isboxer.

Kaige- You have some awesome points regarding the utility that are really selling me here on the warlock. The soulstone, summons, healthstone, and curse make an extremely compelling case. I had forgotten about curse of elements on single target.

Nodoze- I really like your idea of moving the druid to a tank role. The only reasons I hesitate 1. Because he has pretty good resto gear (pretty much all raid BiS except weapon and ring) and 2. I'd have to respec him every week for raids. You are SO correct regarding the hard taunt. Fighting bosses with aggro drop is probably the single hardest thing about my current setup and using a pally tank. For trash pally is easy mode with dropping consecration, but on aggro drop bosses or if aggro is lost for some reason getting the mob back is tough.

I think I'm down between a warrior tank and warlock. Tough decision. Thank you all so much for the input!