Well, I got it fixed, and even used the lazy buggers method of not using timing tools at all. I just clamped the cam gear to the cover behind it, clamped the belt to the cam and timing pulleys with vice grips, and wedged the belt between the intermediate shaft and cover so it couldn't slip on the crank gear. Then I removed the pump pulley and removed the pump. Fairly easy install, I just started the pump shaft in the pulley before getting the pump fully into the bracket, then got everything bolted up. I turned it over by hand to check it, lined the pump up with a mark I made before removing it, and it started right up.