Gregg, I'd be glad to touch up the Laser II for you. When things settle down, we need to test different props on your boat. Steve has a Rapture 21" he swears by, the present 20" Laser II may work, and then I have my collection of props for you to try.
What gauges do you have - speedometer, tachometer, water pressure, trim angle?