I hope you’re right.
If Trump wins reelection I don’t see any positive developments coming from the government itself. I suspect you’re right that in the US, positive change will have to come from NGOs or from grassroots corrections of government ineptitude and venality.
It’s funny how technology, including social media and the internet provide theoretical conditions for such grassroots uprisings, as Facebook did in the Arab Spring. But the improvements rarely stick or get off the ground, because the rebels or the have-nots are going up against the entrenched powers that rig the systems.