Water has really good thermal mass already. I think that adding huge water tanks in basements would be pretty beneficial: if the water in those tanks is operated in closed cycle, minerals from water wouldn't accumulate, and if we used rust proof materials, they tanks could last for the lifetime of the house. Then, we could use them to store heat in winter and cold in summer, when electricity is cheap.