John, several years ago, I had the w/h tank rust through and was able to replace only the tank, saving the burner assembly from the old and putting it on the new. Seems like you could do the opposite and just change out the burner assy. Lew