There is third option with excess solar energy production - send it elsewhere.
This is partly what China is doing with solar - concurrent with massive solar installation there is also extensive ultra-high-voltage electricity transmission lines being laid out, to load balance excess production in the sunny but sparsely populated N and W, with the excess consumption in the heavily populated S and E.
Australia, Morocco, Spain I think are also getting into this game, though in these cases for energy export