I had the same problem. I decreased the angle to about 20 degrees and dumped my front weight and it made all the difference. decreasing the angle allows the non side wake to back up the surf side a little giving it some peak. Like figuring out your ballast, you have to figure out your ballast, gate angle and speed. The result is dramatic with significant less weight needed, no dangerous lean and quit switch to the other side. I'm using my 750 bags in the rear lockers only compared to one of them in the locker, one on the surf side floor and my 1100 lb bag in the front.
2003 Supra Launch 22SSV
1986 Ski Natique 2001