It's been awhile but here's pretty much the end of the story. Still some stuff to do, but after two years, that's it until winter.
For those interested I ended up with a 4-blade 17x19 lightly cupped nibral prop from Atlantis Propeller. WOT is around 3,470 rpms (OK per Mac Boring). I could be slightly underpropped but I want to wait until she gets loaded up.
I'm getting 30 mph at 2,950, 31.5 mph at 3,100 and 35+ at WOT. We checked the instrument tac from Yanmar and it's off by 200 rpm's high over 3,000 rpms. It' about exactly what I was told in the beginning.
Here's some pics. I'm going fishing.
Inside Console
Console and Overhead
The overhead and the T-Top would look better if somebody didn't plaster those Pipe Dreams Marine stickers all over the place.