>>less dependence on a business partner (surprisingly) turned adversary

I'd argue that it's been coming for a long time (behavior that in a non-MFN nation would be considered 'predatory', decades of IP theft) and isn't surprising at all.

That said, I'd agree that 'edge' resources make for better scalability - although local PV and wind are not constant and so either local energy storage or use of the grid as one is needed as well - and local energy storage is uneconomic given current battery chemistries, although iron flow batteries for stationary storage is looking promising. The point being to generate less greenhouse gasses without further damaging the planet (e.g. cobalt mining). A shift from coal to methane (nat gas) is a step in the right direction - and gas turbines have the ability to spin up quickly enough to complement wind/solar - so that seems a reasonable short-term step.

The US had an opportunity with post-Maria Puerto Rico. The grid was gone, and they could have just as easily pushed production to the edge, and possibly storage - but that didn't happen, IMO due to corruption in the Trump administration. Sigh.