Replace 40 gallon gas water heater with new 40 gallon tall skinny water heater. Replace supply lines, gas lines. Add pan to closet and add a water pan alarm.
