Yes, polymorph self should work without gaining too many extra hp. Offensive polymorph should stay as it is now.
Actually, after reading, I am pretty sure, you can´t polymorph yourself with polymorph... I believe with the animal´s mental abilities, you can´t concentrate on spells. So we really need a polymorph self spell.
Note, that shapechange only gives a one time bonus hp. After the first change you don´t get anymore hp.
I however must admit, that the HP of a CR 17+ are maybe a bit much, even for a level 9 spell. CR equal to your level is also quite hefty, as a CR equal to your level means capable of holding out for a while against 4 characters of your own level...