A little indicator that I remembered: if the tiny torx screws that hold the fuel temp sensor are corroded or other items under the top cover of the pump, then you have a water problem in the fuel.
I had an issue which was traced back to a wire that had rubbed through. On the wiring harness.