Been there and hope to eliminate!
After having the engine stop at always the best places, replacing too many filters, dealing with blockages in the pickup line etc., and a very busy fuel dock, I just placed a portable tank system on board. I get fuel at the local gas station on the way out to Kemah, two quick connects, pump the bulb and we are off. If a tank gets dirty or bad fuel, clean up is now going to be easy. I removed the lines off the main tank and extend the pickup and return lines by 8’ and place then in the stern locker. The 2 tanks are standard outboard tanks (non-metal) which I may paint yellow or label DESILE. I picked these tanks for the same size threads are used for the fuel gauge and the pickup and can be swap around. So, with 2 tanks I placed both pickup ports on one tank, which gives a return line and the pickup. I place the two fuel gauges on the spare tank. The cost was around $100.00.I sail in the Galveston Bay area and 6 gallons should last about 3-4 trips. I will have the main tank clean out by a shipyard next haul out, I will not use the main tank but keep it dry. It will be used only for the BIG trip if that ever happens. Mental FlossH-34 1984