Onan Fuel Pump

Anyone ever substitute a generic fuel pump for the OEM unit? I'm having what I think are fuel delivery issues, generator runs for as long at two hours, then sputters and dies like its running out of fuel, changed filters and they were fine, still does it. No code beyond "unexpected shutdown" so its not going off on that and sure sounds like fuel starvation when it quits. Was thinking about one of the small solid state pumps but mounting it back near the tank so it pushes instead of pulls the fuel. OEM pumps are a bit pricey compared to these generic solid state units.

Thoughts?