At least with studies on the Australian grid, it seems like the need for "baseload" sources is myth fueled mostly by resistance to upgrading to renewable sources.
https://www.energymatters.com.au/renewable-news/baseload-ene...
https://www.energymatters.com.au/renewable-news/baseload-ene...
I recommend 2030.