First, a few pics of the re-plumbed equipment pad.
I bought and installed the heater last month, which required rerouting the pipes, and I added a bypass, because, why not.
If you ever find yourself needing to reuse a valve or 2, get a Reed Tool Extreme Ream. Gold.
Then, I didn't like...