I added some dish soap to the half empty tank and sailed for five hours. Pumped the tank dry, refilled and pumped dry again, repeated three times (160 gallons later). All the fuel smell and soap seem to be gone. I am going to haul the boat this Tuesday and will revisit the water tank next Fall. The problem seems to have gone away. Time will tell