Trouble removing distributor from an FE....

[SoCalCoupe]

Dealing with a 1962 406 CID engine. How do I remove the distributor? I disconnected the wires, removed the cap and hold-down. I pull up and out several inches, the drive gear clears and several inches of the oil pump drive shaft clears but there's something on the bottom of the oil pump drive shaft I can't see that's hanging pulling the whole assembly out.

Looking at other sources, seems like the oil pump shaft shouldn't have come out because there should a collar at the top that holds it in the engine. Possibly the oil pump drive shaft was installed upside down with the collar at the bottom, not the top? Here's a link AI found for me that supports my up-side-down theory. Unfortunately, it doesn't describe a way out. I'll read it a few more times though.

When I try to reinstall the distributor and oil pump drive assembly, it won't fully seat. It sticks up about an inch. The drive gear seems to be engaging correctly but the probably the oil pump drive shaft isn't?

Don't know where to go from here. I'd totally like to avoid removing the oil pan.

Help.

Oh by the way, I'm all but certain the centrifugal advance is the issue with my idle. I can manually turn the rotor CW and CCW and there's no resistance or spring-back in either direction.