There's a company called Harvest Thermal that specializes in using water tanks as thermal energy storage that provides domestic hot water and heat. You could reach out to them.