[Altavia]

For those looking to build new, there are tankless water heaters with a built-in recirculation system. They require a separate return line. May be worth the upgrade cost.