Perhaps my opinion is jaundiced, but I believe dispensing with affirmative action will push women and non-whites back 50 years.  We've gotten where we are because of aggressive affirmative action.
I have zero confidence the Elon Musks of the world will, of their own volition, behave in a color-blind, gender-blind fashion.   
Simply because more women hold college degrees does not necessarily equate to earning power.  My nephew, a HS degreed, construction welder, earns well over $100K/year, plus generous benefits.  His wife, a teacher with a bachelor's and master's, underearns him.  Few women have the physical strength to perform his job, and that's true of nearly all heavy construction work. 
LAPD is comprised of only 18% female officers.  Before any overtime, after 2 years on the job: $92K.
LAFD has fewer than 4% female firefighters.  They make as much or more than LAPD officers.
Both jobs require no more than high school graduation or a G.E.D.  
If boys are being left behind - and there's little evidence they are - then that situation needs attention.  But throwing the baby out with the bathwater isn't the answer.