Sounds like your simply riding too powered. Cat should be sweet for what you want.
Anyway i believe the answer is no. You won't find a better boosting and wave kite. boost is at one end of the spectrum and wave riding at the other.
You will have to make a compromise. Better at boosting worse at waves.
.... Worse at boosting better in waves.

This is exactly what your finding with the cat. To be fair though cats are freaken awesome in the waves. Important not sure what your complaining about.