I have a 07 Supra 21V I bought new. I have only replaced a ballast pump, wake plate actuator, and a heater core that cracked over the winter. The stock ballast pumps aren't the fastest but I haven't switched mine out yet, maybe next winter.

A cheap/easy ballast upgrade on my boat which you might be able to do is to take the stock gravity front sac, 650lb, and put it in the rear locker, get another stock front sac for the rear locker, and then put a gravity games front sac 1200lb upfront.

For surfing I also put a 650lb fatsac on the rear seat and keep the front sac around 2/3 - 3/4 full.

I use the Mission wedge.