Install new 40 gallon natural gas water heater. Bradford White water heaters are the best water heaters, they come with a 6 yr standard tank warranty. If repair parts are needed in the future there are several supply houses in the area that have parts.. East lawn supply has a huge inventory of Bradford White water heater parts.