Avance 22' Prop Question

[ktensen]

Hi all, I have an "04 Avance 22' with a 250 Mercury EFI that I am going to replace the lower unit on. The old lower was a torque master with the 1" shaft and I am replacing it with a torque master with the fat shaft so I am either going to have to rehub the Mirage prop I have or just get a whole new setup (which is the way I am leaning). I am running a 20" lower with an Armstrong bracket, I think 22", and trim tabs at the rear. Right now the 23 Mirage, not M+, gets me out of the hole with no problems however my top end at 5700 RPM is only about 53-54 MPH. The only mods to the prop is that I ported it. I do get some ventilating during a hard turn or when I am at the coast going over a wave.
I know there are a few folks that were on here that had an Avance 22 but, so far I can nail down what prop they were running. I think one was running a 25" and went to a 27" on a Yamaha and I have seen another site someone running mid 60's with a Merc and 21" prop but couldn't tell which one. I usually run with a Yeti 110, 100 lbs, in front of the console with 2 people, 450 LBS, fishing gear, 150 LBS, and a 27 gal livewell between the front seats, 250 LBS and 3 batteries in the console. If there is any other information I should be providing, please let me know.
Any help with prop selection to get me started would be greatly appreciated.