A bit more progress - two steps forward, one step back...
Pulled apart the upper drive, installed all new seals.
New intermediate shift shaft. Got the drive assembled, installed, filled with oil. All seems to be going well.
Connected trim rams, filled system with oil. Trims up just fine...