(above is part of my post) Check out the post by Zax"Druid skill rework concept"
Edit: And if adding teleport while shifted, might as well add shouts.