I would not put all my money on just one solution. I don't know how many years away grid scale storage is. I hope it's 1 year, I expect it's a decade or more.

Besides, we had 6 consecutive weeks country wide harsh winter this year. Storing it over night, or over a few days of mild winds is feasible. 6 weeks of little to no sun, mild winds and high demand is eyepopping.