I got the distributor back and it is installed. He cleaned up the aluminum at the bottom, lubed everything, one extra shim, new gear, cap, and rotor.
Since I had the pan off, I was able to check the pump drive shaft for binding. Guess what, that was the whole problem. I never thought that taking .008" off of the heads would be enough to cause binding, but either that was the whole reason, or it was a combination of things. Live and learn I guess.
Instead of getting shims for the distributor at the intake, I just ground a tiny bit off of the pump drive shaft. It should be good enough now.
I have one question though. Since I had to remove the pump, do I need to reprime the engine before I start it?