Sad day back in 80's when Hunter execs had a long (liquid?) lunch with a tank builder who gave them a cheaper price to make all (!) of their tanks out of aluminum. The chlorine in municipal water supplies speeds up corrosion, putting white aluminum oxide thru the system and eating away at the tank.
What happened with the waste tanks was worse.

Perfect for diesel, tho.
Our boat came with Ronco rotomolded tanks (drinking water and waste) - probably would last forever. I did replace one of the two to get a lot more capacity... and had the replacement fab'd up in SS, by a local guy that did "brewery grade" work. Bit of a design and install hassle, but went from 23 to 38 gallons, in the same place under a settee. If you are keeping your boat for a few years, this is a Great solution. Otherwise, go with Ronco; nice folks to deal with, as well.
Note that there is a 'plan c' also....... we finally replaced our second tank with one that fit the space a LOT better, and was welded up in plastic by a local guy. A little more expensive, but beautiful workmanship. Before that, I had heard of welding plastic, but never seen a real-world result.
Good luck with your water!
Increasing water capacity for cruising will make the Admiral very happy, and this will lead to happiness for the captain.
Cheers