First, agree on a reasonable majority level required to pass laws. Part of what drives this panic that we have seen by both sides over the last decade over losing or gaining slim majorities is the fact that ever since that scumbag Reid went nuclear, we now do things with huge effects with a simple majority. 51% of the nation dictating policy is not good for anyone.
Second, less federal overreach. Again, if states and communities provide people the political and cultural happiness they want, they're less likely to be rioting. Just stop trying to override it at the federal level if your party is in power.