I think I may take some heat for my opinion, but please allow me to try. The Israeli Air Force is widely recognized as having the best pilots (Red Flag exercises and real-world operations). Israel does NOT require bachelor's degrees (or any degree) to become a pilot, and they don't care if you're male or female or green or orange. They allow nearly any Israeli citizen to apply for pilot training (a diverse recruiting base). However, their evaluation and training curriculum quickly weeds out all but the best pilots. Their washout rate is very high, as is the Navy Seals training program. All they care about is how excellent of a pilot you are. They do not care about diversity of skin pigmentation or sex in the demographic of operational pilots, because that is not a criteria for building the best Air Force. Pick the best long-rifle shooters to become snipers. Pick the best pilots to be combat pilots. Ignore the rest, if you want to win.
How about we not care about diversity as a primary characteristic, and instead go with capability such as an OML? I think when diversity becomes more important than capability, we will eventually pay for it in lives left on the battlefield.