Thanks!
I wanted to check the maths before I definitely rebuild. Fairly sure there's no way, so now I just need to decide if I want pure Druid on the rebuild or Shifter. Hmm.
(Incidentally, I've searched the Build thread for a 'How to do Dragon Shape' post but couldn't find one - could some kind person point me to it?

)