Oxygenics is what I recommend. Do this test, open both hot and cold faucets fully at the same time. with a stop watch, and a bucket, direct the stream into a bucket and start the watch. After one minute remove the stream and shut the water off. Then measure the amount of water in the bucket, my Oxygenics uses 1 and a half gallons per minute. So a 6 gallon water heater without adding any cold should stay hot for 4 minutes. Now add half cold water from the faucet and the time for the hot water goes up, You are now using 3/4 of a gallon of hot and 3/4 of a gallon cold per each minute. Your hot water should last 8 minutes. This is what I do when taking a shower, turn the hot faucet on full blast, when the water comes out hot, turn on the cold faucet until the temp is where you want it, get in a shower away.