how about putting an uprated fuel pump in tank. which then only feeds an external swirl pot. and then from that run a 044 fuel pump to supply the fuel rail.
plumb it in so the return from the fuel rail refills the swirl pot before it returns back into the tank!!
that way you should keep the swirl pot as full as poss at all times!
Kelvin