"Oh, we should stop deploying solar and wind" is not the best action on this problem.
The future here will see more solar panels over the already high numbers, more battery parks and "local" batteries (for 200 homes or so) and more vehicles on charge (soaking up the current excess).
The key feature, which is already partially in play, is a smart grid that can adapt to distributed demand and supply.
Can be added to the long list of advantages of WFH adoption.
And to ensure that solar system owners are paying full retail prices for grid electricity, when commercial operators are making insufficient money.