You're conflating sex and gender there. Gender is what's in your head. Sex is what's in your pants. Not entirely, it's obviously more complex than that, but at a very basic level that's it. So if labels must be used (I'd personally see them reduced in significance because I honestly can't see them being wiped out entirely) then labelling personalities as genders is the correct way to go. Physically, I'm male. That's my sex. But mentally, personality-wise, I'm female. That's my gender.