Gender itself by definition supports there only being two genders... male and female
"the state of being male or female (typically used with reference to social and cultural differences rather than biological ones)."
I don't disagree that people cannot change their genders, they can. Men can become women and women can become men, but only if they completely undergo full surgery.
they're used interchangeably on official documents, and have been the same thing for years and years. It's only recently that people have tried to say that they are now different because they want it to be