You said your modelling needed "something on the order of 4000GWh of battery storage"
That's not outlandish given the cost of distributed batteries.
Are you upping that model?
(If you build more generation -- for example have renewable peak generation of 80GW rather than 40GW, that reduces storage requirements drastically, as on a dull quiet winter week where you're only getting 10%, you'd be generating 8GWh in a given period of time, instead of 4GWh)