Aren't those symptoms consistent with a tank that cannot breathe. The pump works fine for a while until a vacuum builds in the tank, until the pump can't overcome the vacuum.
Test with tank on vehicle is to run with the filler cap removed.
Basically, check breather is clear.
Edit.... Looks...