Much better than batteries or gravity storage mechanisms is liquid air storage. It is not for small scale sites, but the bigger, the more economical, it becomes. As an OTS (off the shelf) solution i do not know why it is not used more...
Liquid air storage offers cheapest route to 24 hour wind and solar