I hate to say it but the problem is less likely to be the boat, more likely to be the rider. Shorten the rope and hold your edge to the lip of the wake. Smaller wakes are often easier to clear than bigger wakes.
Trim it up as far as you can with it cavitating or porpoising and work with the rope length. Can you Ollie?