I suggest we replace all of that complicated stuff with a simple, optional textfield where the user can talk extensively about his pronouns, why he sexually identifies as an attack helicopter, why his genitalia exhibits quantum behavior, why his gender is located on the higher end of the fractal when the planets are aligned a certain way, and whatever else that person has to say.
That way no one would be left behind. No feelings would get hurt. Easy to implement. Easy to discard for those not interested. Lots of entropy to characterize your gender etc.
I suggest we label this textfield the "special snowflake field", and make it 4096 characters long. Although there is a case to be made for making it 64K, if that can help people feel safe and included.