I made my own pick-up/return with pump for a pretty low cost. I also use a surge tank up front. Fuel flows to and from the surge tank at high volume, but near zero pressure. The surge tank to fuel rail return loop has the high pressure with no cavitation or air from a low main tank level even while road coursing with a couple gallons in the main tank.

Note the larger sized return line I silver soldered in to reduce fuel return restriction, and the submerged fuel line is rated submersible. Regular fuel line will disintegrate rapidly.