The bit about the druid: if you haven't seen it yet, take a look at the PHBII variant of the druid. It's similar to what you have. Lose the forms/day and the familiar to gain change at will into a limited set of creatures instead of anything the player can find. (Take on the appearance, but not the stats of a wolf. You get flat bonuses based on which "form" it is.)