We should be blanketing every inch of desert with solar. And pair it to use excess energy for carbon fuels synthesis. Reuse all the existing natural gas power plants to run on synthetic carbon fuel. Batteries are not the solution for this. It only fixes the day/night imbalance, but not the seasonal summer/winter imbalance for solar production.
But most importantly, we don't have time. We don't have time to wait for the beautiful, elegant solution of all cars EV, all power storage in batteries, all planes flying on electricity. Perfect is the enemy of good. Look at the arctic and ocean temps, we do not have time. The developing countries will not wait for the perfect nice solar and battery solution. We need to reuse as much of what we have now in a way that will make a difference for carbon output. Again, we do don't have time for the most efficient solution.
What is industry good at? Mass producing a lot of stuff. We can do that now with solar. Stop worrying about matching it to daily power usage. Just pump out those panels and get it installed everywhere. Get the excess into synthetic carbon fuel and we can quickly make a difference in carbon output.