All it took was setting the water heater a bit lower, and the water stopped coming out scalding.