I'm glad to hear you're still working in the field. I am writing a handbook for practical sustainability, which is my main motivation for engaging in online discussions like this. I wish you luck with your new company. You may want to connect with Michael Barnard. His company is called TFIE Strategy. Check it out at https://tfie.io/

He publishes for a general audience (as well as paying clients), but often includes data points and references to data sources I find helpful.

One final thought that seems like I haven't conveyed clearly: the energy market is evolving. It takes time to build things. What's happening right now is that it is much faster to build solar projects, at the grid scale but also at much smaller scales. Every other electricity generating technology is being squeezed at both ends by solar. At the small scale, it is more and more feasible to build bigger and bigger battery-based microgrids. At the large scale, it is getting easier and easier to build large arrays and use energy storage and grid management software that incorporates both generating assets and demand-side management, with curtailment as a fall back. I don't have time to list all the demand-side management projects my company is doing for our local utilities here in Maine, but let me just say this is a very active area of research for them.