We decided to have the water heater replaced as the original (while it worked) was very old and a new one was not very expensive. Colin and his crew, however, had some fabrication to do to make the exterior look good:

P1010041
P1010038