Looking at the list: still just Male and Female, while trying to specify how comfortable one is with which one is, and which one would rather mate with.
...and frankly, when using a pronoun I don’t care how comfortable the subject is with being Male or Female, and don’t care which the subject would rather mate with. I DO think indicating the subject is Male or Female is useful to a healthy society.
"Gender" (the social construct) is a term of art in postmodern critical theory that is not a synonym of any previous meaning the word may have had.
It has no actual meaning in itself ("meaning" is itself an outmoded social construct).
In postmodern critical theory, terms of art are used to create confusion in the minds of people who still think in terms of words having meaning.