You are doing just fine as you are. Leave it be. One of your negatives is your comment about water toys. You can't max speed and tolerate water toys, just isn't the way it works unless you like to swap props every time you decide to do something different.
I just spent half a dozen years with an alum boat the same size as yours with the same engine. Difference in mine and yours is that I didn't tow water toys and my bottom was stepped, like a fiberglass pad boat whereas as you would increase speed fewer of the steps got wet meaning that less hull was in the water and there was less drag allowing for a higher pitched prop and more mph. Look at the wake in my Avatar and look at your wake at WOT. That's the difference a stepped hull makes.
Best I could do with a Ballistic 13+ x 24XL SS high performance prop was 48.5 gps with me alone in the boat (see my avatar) at 5800 rpms. I had to port (drill vent holes) in the prop to get a good hole shot with this much pitch.
My best all around prop was a Ballistic 13+x21 SS which I could get up to 45 but I was running up around 6000 rpm and I could add a second person to the boat and it didn't make much difference. But I didn't like running that high and if I didn't look at my speedometer which was reading about 1.5 mph too high at WOT I didn't know the difference between 40 and 50 mph.
So, my man, been there done that. Now if you just want to puke your money, I gave you a couple of data points that will be above, but close to, where you should get.
HTH,
Mark