You live on the lake = no upgrade to trailer (unless you travel anywhere else, then at least get a spare tire and rear tie downs)

I don't have the surf pipe being an older boat - but I will be adding it this winter. I don't like the exhaust and would like it a little quieter while teaching kids (most will say must and also much cheaper now than later)

Tower and stereo are opinions - I like loud music but teaching kids we barely use it. Wish I had side pulls!!!!

If you ever plan to sell it later down the road, everyone will want Pro tower, surf pipe, and large stereo (so think about length of ownership)

How big is your typical crew? Buy a boat for you and your family not everyone else. If storage isn't an issue, slip size isn't an issue, boat lift (if you have) can handle either mojo or makai, cost optioned is so close you cannot tell in your payment.....buy the bigger boat. But make sure you are still meeting your must. Does the '22 Makai have Cool tech?