I ended up buying one of those instant hot water heater’s, and installing it into my system it runs on propane, it’s extremely efficient, and perfect for my three bedroom home it takes a couple months to go through a 5 gallon bottle, I also have a 250 gallon cistern on my roof as back up, With a three-quarter horsepower pump, city water runs into the cistern  Through a bypass, so I always have city water when it’s available, sometimes the water gets shut off by the city, when that happens I just open the valve turn on my pump and I have good water pressure again from the cistern, when the city water comes back on, it fills up the sister in again. Very reliable and inexpensive system, when the power goes out I have a generator that runs my water pump, As well as all the lights so I Always have running water.