https://en.wikipedia.org/wiki/Rechargeable_battery
So this alone would increase your cost estimates by 150$
And for society you probably want a weeks worth of electricity stored in some form or other to deal with weather differences, and not summer winter difference. So minimal goal would be 24*7. Or just more than 150 hours.
Or that another 1500$ of cost not included in your estimations. Now a big thing to realize, in electricity markets where networks are required to take in solar and wind from other players, its not the producer of electricity that bears the cost of that large storage its the utility that buys the electricity from market.
Right now it works somewhere along the lines. Lets make 40% efficient fossil fuel plants instead of 60% efficient slowly starting fossil fuel plants, so that we can turn them on and off for covering the difference between intermitted sources and consumption. So in reality renewable plants end up just becoming fuel saving devices for fossil fuel plants while reducing fuel efficiency of said plants when they actually are turned on . In long run I believe nuclear is way to go if we want to stop global warming. The intermittency problem goes away with it and you can run a grid with 100% nuclear with very little storage because production isn't intermittent, and with modern plants you can vary electricity production between 50 and 100%
Global warming is accumulating effect, the emissions are just rate of change, and not the temperature difference, and we need to aim pretty close to zero emissions to stop it. [Yes nature takes some of it off from circulation but a lot less than people think because naysayers compare our emissions to winter, summer cycle of plants that cancels itself in yearly basis.]