TLDR: stop highlighting differences, set common standards, and emphasize common goals.  The more differences are emphasized by diversity programs, the more people start to react to us/them divisions.  Applicable to many qualifiers (race, sex, religion, etc).

Hard Truths About Race on Campus - WSJ.pdf

Dr haidt, a psychologist, wrote a book called "the righteous mind". In it, he addresses the psychology of racism and comes to the same conclusion. Also consider he is a pretty left-leaning guy.

I was listening to a podcast the other day that highlighted a lot of the things the article discusses.  A differing perspective was offered saying that our lives are so great right now, that we can focus on first world problems like these.  I found this interesting, but would have to agree that it is quite frustrating when I see stats based on race, religion, sexual orientation, etc.  I believe in setting that common standard and moving forward from there.