I am replacing my heater with a Max-E-Therm 400k BTU heater. (Same electronics, etc as a MasterTemp 400, but was a tiny bit cheaper and DW likes the rounded shape better than the boxy shape)
As part of that, I have plumbed in a bypass valve so that I can bypass the heater. And I put a valve...