What did you end up doing about this? Did you replace the 2 water heaters?