I posted earlier but my reply didn't post.... Anywho,,, I thought the same thing SS suggested, 17P prop.
But, that would depend on your current engine RPM, speed and elevation. If your current WOT RPM is low, you may need a 15P prop.
Need numbers.......