And you are slowly coming to my solution. Instead of storing heat energy, I store electrical energy in the battery. And when heat is needed I start the heat pump. The pros - no heat energy losses and close to constant round trip energy losses (~20%). And electricity can do a lot more than heat...