I'd try the 17P 4 blade and see what happens. If your engine is good for 5000 rpm, you're still under by 400 the way you're running now. Worst case scenario, watch your WOT rpm.
Every prop brand is a little different when it comes to raking, cupping, etc. Plus prop technology has changed a lot...