Just do like the mod does and remove the wildshape charge cost off utility forms like raven, cat, and badger. Should also decrease the cost of myrmidons to 1 unless you plan to buff them to be worth 2 wildshape charges.
All combat forms should get proper scaling to lv12 and the difference in choosing each one should be what utility skill from a form you want.
