Diversity is not playing out as if it were a strength. For example, it is blazingly obvious that nobody cares when a white person is killed by police, or when a black person is killed by a black cop, but only when a black person is killed by a white cop, a situation that would not happen if not for diversity. Towards the goal of preventing race riots, we should as much as possible arrange to have blacks policed by other blacks. One way this could done rather easily would be to allow sufficiently black/white/etc areas (neighborhood, districts, towns, whatever) to request that they be policed only by blacks/whites/etcs and require police to respect that decision. I'm not sure that many places would make that deal, but they should at least have the freedom to do so. The long-term goal here is to make blacks more responsible for running their own affairs in order to make future separation easier.

Media portrayals of people and events affect public opinion and therefore affect who wins elections. This means that the media has (indirect) political power, and as such the general public should be way more cynical about media people than they currently are. Rather than mandate something impractical like "journalists shall always report the truth, the whole truth, and nothing but the truth", I think it would be enough to require that journalists identify themselves as whatever political orientation they align with. No more of this "our whole newsroom is left-wing, but we're an unbiased publication!" - at the very least, your readership will know that your whole newsroom is left-wing and can make their own judgments about the significance of that. We can tell the journalists it's like listing their pronouns.

Ultra-wealthy people also have more political influence than is probably healthy. I propose that political donations be allowed only in one's capacity as a private citizen (i.e. no corporate donations), and donations per person per year be capped at a dollar amount pegged to the national median income.