The turbo automatic 300ZX oil pump is higher volume but they have a different style face to them, so you'd need to run the older pre-86 timing belt covers and water pump as well. On top of that they are always on back order or not available for some time...
I have a W-series with about 30K miles on it laying around...
Even if you pull the engine you still have to drop the front diff. It's pretty sucky how it all fits together up there. Drop the diff, drop the oil pan, remove the oil pick up tube, the crank pulley, all front covers, timing belt, crank gear, woodruff keys, and unbolt the oil pump. If the crank gear is stuck on there let it soak on PB Blaster for a day, it should loosen up a lot. Sometimes they slide right off and other times there is no way unless you cut it off. Being as you're in the mid 90s it should pop right off.
Get a new pick up tube gasket!