FWIW you can get thermostatic mixing valves that limits the maximum temperature of the water by mixing in cold water. Lets you run the tank hotter but have the same outlet temp. Fairly cheap I believe.