In fairness, I didn't count Limit Form because it was added in the Final Mix. But yeah, even with that there's still 2-3 more movesets minimum.
And yes, that is a very good point. When you get Final Form, Limit Form is really the only other one worth using (except for specific challenges, like...