I replaced most of mine with ethanol resistant long ago. The only ones I did not replace were the ones coming off the switch. I would have to take the portside tank out to do it. I added a filter between the tanks and the motor. I have had no gas related problems since. I just went with a simple inline filter. but you could go with a water separating one.
2200 Bay Champ/200 Mercury Optimax
2017 Tundra TSS 4x4 Crewmax 5.7L