Maybe try a 17p trophy or work yours down to 18p but a GOOD prop guy. you should be able to spin the shit out of that with the plugs removed and if you are turning the 19 6100 rpms then you should easily turn the 17p up to 6300 and maybe not lose much if any on top end
Tim - what gps are you running?