There is a sand battery start up in Tampere (Finland) that is heating to 1k Celsius so by the OPs calculations that would still give it a small edge over water but with the added bonus of the intrinsic insulation - very handy in the cold winters. They have a pilot plant that is being developed to support the municipal heating network.