Our genders themselves are NOT disordered, and labelling them so is contradictory to the indicated treatment (fixing our sex, not our genders). In my opinion, what we need is a diagnosis that recognises that it's the mismatch between our gender identities (or body image) and our anatomical sex that causes the dysphoria. On the one hand, a valid medical label is necessary for people who are trying to access treatment on medical insurance or social healthcare, on the other we don't want to be rubber stamped with an inappropriate disorder label for life.
We need something like 'gender identity vs anatomical sex mismatch disorder' but with a catchier title
That way, we have something wrong with us -> seek treatment for a recognised condition -> have our feelings recognised -> get treated -> are CURED of the aforementioned condition!
I don't think this way of thinking would cause problems for any of us.