Wanting to upgrade from my 205v

Owned an 05 x2 (205v) now for many years and Im now ready to upgrade to something with some more space. Budget is 60K. I wakeboard 90% and the rest is either surfing or pulling the kids around in a tube. I just have 2 major deal breaking requirements. With that being said 1st requirement is I need a boat that throws as solid of a wake as a 205v. I need something that is going to boost me. 2nd requirement is I need a boat that has more room inside the rear hatches than my 205v so I can work on the engine. Im 50 now and getting tired of the yoga positions i have to get into working in the tiny hatches of my 205v. I do all my own work on my boat and own a huge aluminum gantry lift and specialty tools for working on inboards. In all my years of wakeboat ownership I have never had to rely on a repair shop for fixing my rig so I also need to stay away from boats with heavy electronics(touchscreens) to keep on doing this. TIA fellas.