They make a mixing valve that you can put on a 40 gallon tank. Basically this allows you to set your water heater to a hotter temp like 140-150 and the valve will mix cold water back in at the exit point increasing your capacity. The valve controls the temp coming into the home so you will not...