I have a 2008 21V Pap and I've never heard anyone describe the wake as a wall, maybe the SANTE 210 but not our boat. At 60' and 21 mph you're going to have a steep ramp on the wake, even so at 65'. My wife rides at 65' and 21.6 mph usually and I bumped her up to 22.6 mph and the wake narrowed a bit for her and she's clearing w2w no problem.
What is your ballast setup today? GIII with a 650 lb in the playpen, 2 400's in the lockers or did you upgrade your bags?
Surpass, especially the 21v likes equal weight front and back. If it is too steep at 60' for you either speed up or don't fill the rears totally full.
2008 Supra Launch 21V - Currently for sale