I'm not saying you're necessarily wrong, I just don't see society taking that measure until it's either 1) cheaper, or 2) the threat moves from being just a threat to reality.
Completely agree. But I'm already there. Large scale economic disruption has just started. For that to remain peaceful over the next few decades would be a miracle. So we should plan for disruption, for which energy decentralization is a keystone, and the technology to make it practical is here.
California has a 600 MW Virtual Power Plant composed of Tesla Powerwall batteries in 85k homes. Central control of distributed generation removes a lot of inefficiencies. Household excess is available to the whole system.