Possibly for the older cars a simple expedient may be to fit a fuel filter / water seperator between the tank and the fuel pump, perhaps fitted to the bulkhead or inner wing. Some have a simple drain valve on the bottom to drain out the water every so often. This would ensure decent fuel getting to the pump and then to the engine. Of course you still need to address the tank issues with regards to potential for corrosion.
