Through long inspection and process of elimination, we believe the glassed-in diesel tank on our 1986 H28.5 leaks. Review of prior posts indicates draining of present tank and installation of new tank is more cost effective than removal/replacement.My question, does one just strap a similar size (11 gal) tank over the top of the old one? Or, does one attempt to re-organize the aft end of the starboard locker, moving the water heater (which is original also and may need service sooner than the replacement fuel tank)?A follow-up, what is the preferred tank material - Aluminum or poly-whatever?ThanksBob G.