New shims, shift dog and gears installed. New gaskets, lower unit seal kit and water pump in, new gear oil.
Seems to be shifting better by manually pulling the shift shaft. True test will be back on the power head and correctly adjusted shift cable.
I did notice its pretty tough to manually...