I am happy with the increased role of shapeshifting in the druid; the more I've thought about it the more I feel that it's what makes the druid not a cleric. If the druid isn't primarily a shapeshifter why not just have a nature-domain cleric and call it a day?
I don't disagree with you. One other thing druids have that is distinct is the strong tie to the natural order. Its not a strong mechanical (ie conflict resolution) distinction, but if its good enough for rangers, it is good enough for Druids. All without wildshape.