Instead of changing e.g. Tree of Life to be CD based, give the druid the choise to partly change into the different forms (only cosmetic differences), rather than full NE/Worgen/Troll/Tauren, or Full form..
I don't see why Blizzard do something like; http://www.mtgmintcard.com/images/pr...-WILD-SCO6.jpg
So if you want to tank as your normal form, you can shift into having parts being a bear - but if you prefer to be a bear, let them choose that.
I definitely would enjoy seeing a Night Elf being half a bear, for a change...
(And no, not QQ - I don't even have a druid anymore, I just think it makes more sense if the druids soon could control their shapeshiftings a bit more than now)