[Shane826]

Just be aware that (at least on my TMs) the sink drain pipe goes right in front of the upper water heater outlet. Adding the bypass will require a couple 90° street elbows and a slight modification of the hot water PEX piping. But like you said, a bit of a hassle now makes it oh so much easier later.