Easier, cheaper and quicker to refurb the pump.Replacing the pump first
I'd be looking at the alternator rotor firstEasier, cheaper and quicker to refurb the pump.
Oil Pump Repair | Norton Owners Club
www.nortonownersclub.org
If its also happening in neutral then it could well be something else like a loose alternator rotor or something in the primary case.