Hook a gage on fuel pump discharge and tape it to the windshield and watch the pressure. If a bad fuel pump filter etc you will see pressure drop just before engine shuts down.
If the cold rag trick works for vapor lock problems the old timey solution was to wrap the fuel lines - especially the metal ones - with aluminum foil.
From sounds of things I do not believe you have water in fuel problems. Water willsettle in fuel bowl and make for a hard start.
Dan Bentler
.
