Need Help Finding The Right Prop 29' Envision, 454, Bravo 1

[thedukeryan]

I currently have a 1996 29' Envision Combo Cabin. When I received it the engine had been pulled and was just the hull and drive. I dropped in a 454 bbc, 781 heads with enlarged valves, Edlebrock RPM intake, IMCO PowerFlow exhaust and Comp cams 262 XTREME MARINE cam. The machine shop that built the engine said that I should be running it at 5500rpm's but the cam specs say 1-5k rpms. Any suggestions? My current max RPM's at WOT are about 4500 at roughly 40-45mph. My current prop is a 23p Mirage Quicksilver 48 13704 A41. One last thing is the prop seems to cavitate or loose traction if I try to trim it up to quickly. My thoughts where adding a Hydrofoil for the cavitation and switching to either a 19 or 21p prop for the RPM gains. Any advice?