So I think I'll go with a 2.0 ratio and s 22 or maybe even a 20 pitch prop set then...
If you think you'll need a 22 or 20p propset, you should consider getting a 2.20:1 drive.
That way you have a tad more leeway with props. Especially if you're considering rebuilding your engine and maybe upping the max RPM to 5000 RPM.
A 2.20:1 drive with a 24p propset would yield approx 40 MPH at 4600 RPM with 15% slip. that's not unreasonable for a boat your size.......
But to do that, you won't be able to just bolt a lower on your current "upper" You'll need to find a 2.20 Bravo III drive.
But assuming there's nothing wrong with your current drive, it's valuable on the used market.