We'd be better off without having officially to declare "gender" at all.
We meaning everyone, not just those who have been discriminated against.
The Case for Gender Anarchy
http://reason.com/archives/2017/07/25/the-case-for-gender-anarchy
Philadelphia used to require every public transit pass to say whether a rider was female or male. For Charlene Arcila, a transgender woman, it didn't matter which option she chose; either way, some bus drivers deemed her pass illegitimate. Left to decide on the spot whether Arcila qualified as a man or woman, individual city workers would come to different conclusionsbut every one of them had the power to refuse to let her ride the bus. ...
Finally happy ending to that particular case, but here's the real point.
... Instead of making it easier for individuals to move between two binary positions, Davis writes in his new book Beyond Trans, they should be "questioning our need for sex-classification policies" in the first place. ...