Which is larger? The number of people who would object to "what is your gender" on weird-ass gender politics grounds, or the number of people who would object to "how do you wish to be identified?" on the grounds that it's ridiculous politically correct pandering to weirdoes? I don't just "wish to be identified" as a man... I am a man, and I have the external sexual organs, facial hair, Adam's apple and XY chromosomes to prove it.

Someone's always gonna complain, no matter what you do.

This fixes the issue of "there's more to gender than male/female/other", but it doesn't fix the issue of "women might not want to get sexualized comments sent to them".