Along the same thoughts, the last time I had "engine surging & choke to start warm engine after dying" was due to some water at bottom of tank and a few waves to mix it up a bit. Pumped out the tank and fresh fuel solved problem.