Given that there is little to no support in history or myth that I am aware of for druids turning themselves into animals, I say do away with "wildshape" (silly name, anyway) entirely. Leave that sort of thing to Wizards' polymorph spells. Druids can have other fun, nature-y, dirt-worshiping...