I agree with this as well, honestly. Well no, I don't agree with removing the option, I think it should give another benefit -- i.e. when Egalitarian have 2 units for every 1 in the pool of population to choose from as compared to if you weren't Egalitarian.
I do agree with choosing the gender. Otherwise you have to keep exiting and re-entering and exiting and re-entering until you get the gender you want for a particular unit.