My money is still on the fuel pump assembly
If that turns out the be the culprit . . . I highly encourage you to be an entire fuel pump and sending unit assembly. Do NOT buy just the pump, and reuse the old sending unit and sock. You might regret that