Well I think the problem is fixed. I pulled the injector pump, rotated the gear until the timing marks lined up, then turned it back a little more to accommodate the movement of the IP gear when it meshes with the helical cam gear. When the IP was mounted the marks remained lined up. I rotated the crank by hand several revolutions and the timing marks stayed lined up.
Bolted everything back together, re-bled the system and tried the starter.
Fired up after about three revolutions and settled into a nice smooth idle. Cycled it on and off several times. Now will always smoothly catch and idle after less than two revolutions.
I guess what I learned through all this is to maybe not trust everything you are told regarding the prior history of your boat and if ANY doubt check EVERYTHING.
Many thanks to Brian at AD and everybody that chimed in with advice.