Fixing agriculture and over extraction of water will do nothing to reduce the risk from the sun. The sun is the greatest risk to humanity full stop. Everything else going on is just a distraction manufactured by those that know the truth. Science and history do not lie.
Discussion
Science and history both lie, with apparently increasing frequency. But I get your point... And partially disagree. Not totally - the sun could overwhelm the earth in a second if it wanted to. But the fact that life exists here is a pretty good indication that long periods of stability are the norm. I've seen videos about how the sun is increasing activity and that's the driver - sure, but the earth is a complex and dynamic system, meaning inputs are not 1:1 with outputs and energy is distributed and moderated. The biggest thing moderating solar heat absorption is water. Humidity, ground water, cloud cover, ice cover, depth of ocean thermocline - all of these moderate heat and interact with each other in unpredictable ways. The only safe conclusion is that water stabilizes temperatures and more water makes for better stabilization. So if we're worried about "climate change" (I'm not really) or milankovich cycles, then the primary question is how much water is in the land. Because we live on land. We definitely should build Seasteads, though.