It’s time to just replace the old questionnaires with Skyrim type character creator slide rules.

“Please define yourself. If you take more than an hour you fail no matter what.”

Yup. My belief is that we are likely to eventually combine the categories of transgender and differences in sexual development (formerly known as intersex) as we discover more about it's biological origins. The vast majority of people have never been karyotyped and have no idea what their chromosomes are.