As I've always understood it, diversity is about emphasizing and celebrating the differences between groups. But in truth, I think our group memberships are the least important things about us.
Some of them may say something about what we believe and what we are; others are simply labels. But groups are the lowest of our traits. It is our common humanity that binds us together; it is our truly unique differences that allow us to contribute and change society. Group membership may flavor our humanity and influence our individuality, but it makes no real contribution of its own. At the same time, though, groups create some of the worst extremes of our behavior: bigotry, tribalism, favoritism, persecution. They're important, but they should not be a focus of our attention, for good or for ill.
I am an American, a Californian, a Scotsman, a Jew, and an atheist. I am a hacker and a writer. I am the product of independent study and of the universities of Britain. I am a libertarian and an objectivist. I am a rational person.
And I don't want anyone else to celebrate these differences. I want them to respect them, understand them, and move on.
Whether you're elevating them or punishing them, emphasizing the differences between groups is the wrong approach. It is what we have in common, and what is truly unique to each person, that's really important.