Also have a T23. Never been in a T22.
I have the same set up, 900s in back and 650 in front. Wave is definitely better shifting people forward. I'd be very hesitant to add any more weight to the back.
Wave is pretty awesome in my book. It is above the waist of most of my surfers. Let me see if I figure out how to post a pic.
Wedge, plug and play, and surfgate are the only mandatories. I have the 409 engine (at altitude) and high altitude prop and I can do about 42 with an empty boat at WOT at 4000 feet. I can get 17 people (mostly kids but 6 adults) plus 900 hard tanks, wedge, 900s in back, and 650 in front up to 12 mph to surf.
I've been happy with most of the upgrade choices I've made. The 409 vs 450 decision was a tough one. We have SP2, the bimini, the chillax seats, regular cruise control (works fine, glad I didn't spring for more), carpet etc.
All right, here's a pic:
The two surfers are 6'3" and a little over 3 feet and are about halfway down the wave.