OEM pump is best. RockAuto should have them. Also, remove the hose where it connect to the pump and remove it where it attaches to the tank. Use compressed air and gently pop a bit of air in there at short bursts. You may have debris clogging the line between the tank and the pump.
I would guess collapsed diaphragm in the pump, but thats me.
