I disagree about one thing, and that is the word gender. I was always taught that gender was a specialist term for the study of languages. Words (in languages other than English) have genders, e.g le boeuf or das Schiff. English, of course, as genderless articles like a and the. (Pronouns seem to be the sole gendered words in modern English.) I lament the postmodern co-optation of gender to describe a property of actual living things, esp. humans. We have sexes.
For your use of gender, I propose sexual identity. This covers who we are andor think we are. Thus a person can be physically male but psychically identify [her]self as a woman. cn