Putting a fuel filter on the inlet side of the mechanical pump might solve the problem, if indeed it's debris from the tank causing the pump to malfunction intermittently, but make it a BIG filter so there's minimum restriction. I like to use the big Ford fuel injection system filter that's about 3" in diameter, with a steel canister. Hide it under the cab near the fuel tank outlet- - - -out of sight, out of mind!
Jerry