Bryan, You might try adding a auto circulating pump to your system . They have a timer that regulates the time that it runs . you would have hot water at the faucet when you turn it on . Auto Circ/Laing Thermotech 2295 Main st. San Diego 619-575-7466 Charles