I would say that any attempts to to bring the numbers of race/sex/ect to some sort of normal distribution will only result in blowback.
If you force people together, you will cause an opposite reaction. The majority being discriminated against will look at all of the minority being promoted as though they were placed there because of a requirement, not because of their own merit. Likewise, the minority individual will either grow a sense of entitlement which will embolden both them and the majority to conflict, or lead them to question their own self worth, not knowing if they were hired to fill a quota or because they had merit. This outcome is shown by the results of forced integration of all types and brands today.
The alternative is to let people interact and hire as they please. Ultimately peaceful and voluntary cooperation and interaction over time is what breaks down barriers that may exist in the form of prejudice.
This applies to the "sex war" as well, and the voluntary interaction here is absolutely critical, because like it or not men and women are different. Some may not think it fair that they have to work extra to prove themselves capable at what was traditionally a male or female task, but every person has to work the cards they are delt. Proving you are capable, not forcing others to accept that you are, but proving, will benifit all those who come after you.
Additionally, above where I dicuss the means to reach some diversity goal, we should not forget the definition of the goal itself. I find "social engineering" to be a profoundly immoral pursuit. Humanity is too large, complex, and filled with too many perfectly unique individuals going different directions for different reasons for me to be foolish enough to think I can poke it in the right places and get desired change, and I would require a mighty narcisictic streak to think I knew what best shape humanity should take.