Basically why the grid exists to begin with
Agreed this is the best option. Economy of scales and our consumers wishes should dictate the Grids plan to incorporate cheap energy ( and emergency) storages.
And, also like you said, change your energy life style and insulate your house wherever you can.