Wow I don't recall seeing your reply 'til now

.
So I got the oil pump I linked to earlier and it does indeed have 36mm gears. But (with a garbage sunpro gauge) I only have 10psi at idle and about 43psi at 3000 rpm. That's with the oil mostly hot, the car isn't registered/insured so I haven't really driven it, just up and down the road.
As for that seal it the vac pump, that might be the problem with my rabbit. Lately it's been taking sometimes 3 seconds for the light to go out.
I'd like to get some bushings made for the oil pump shaft too. Anyone know for sure if they'd be the same between gas and diesels? I have a removed 1.6 gasser I could measure.