Re: prop
We'd need much more info for anyone to be able to answer:
1. What is your current prop pitch? How many blades does it have?
2. What is your engine's current RPM when you're running absolute top speed after trimming to the max?
3. What year/brand is your motor? Or even better: Is there a sticker on the top of the motor that states a "WOT RPM" range? Usually "4,200 to 4,600" or "4,400 to 4,800"
After you gather all of above numbers, I'd recommend you repost your question in the propeller section of this forum and you'll get a ton of guidance.