Fuel Filler Ports--Bad Location

I replaced the 1-1/2" manual bilge pump hose today and was pleasantly surprised that it wasn't all that hard to get to. Also replaced the 1-1/8" aft bilge pump hose. Pulled the fuel filler hoses off too, or more accurately had to use a Dremel tool to cut through the hose where it attached to the filler neck. Tried a heat gun first without success. Those hoses have tenacious holding power. The fuel filler port on the starboard side was the source of water getting below deck. The yard couldn't have put the filler ports in a worse spot—essentially the deck's low point. Water from both the bow and stern run towards the filler port. I couldn't tell if the water was getting by the joint between the filler port and teak, or the joint between the teak and fiberglass. It was obvious when I pressed down on the area around the filler port that water was under the teak deck. Re-bedded and painted the starboard side fuel filler port.