If you're looking for a better wake/ski boat. Because it sounds like you barefoot as well, look at getting a 90s direct drive. They will have a better wake than your outboard does, a lot cleaner and be better for skiing and wakeboarding and you can surf them if you want. Most are made for skiing in the first place and have flatter wakes, but add some weight in them and you can get a really decent wakeboard wake.
A decent direct drive will run you under 10k and meet your needs on a budget.
As for your wake in your outboard. Head over to wakemakers.com and look at getting some sacks for your boat. More weight = More wake.