You're quite right. Forgot about the 15 HD limit on Polymorph. With Shapechange the HD limit continues to escalate, meaning that at higher levels (up in Epic) you'd gain access to the older age categories.

Any particular Lineages you want, or are you planning on using one of the ones I've already written out?