Great news minus the heater! Consider this....the OEM faucet, etc is generally a POC, so you would be replacing it sooner or later....you just did it sooner. In our HTT I turned the water on one nice, warm, sunny day and the OEM faucet literally blew to pieces. Fortunately, DH and DF were standing near the water hook up and shut it off in an instant. We've never had trouble with the shower, but replaced it with the Oxygenics by choice. If you haven't checked your outside shower, you need to do that before you get too far along with other things. "Could have been worse".