That would be great, but it still doesn’t address dysphoria, which is actually about sex, not gender, despite the name. We use “gender” to refer both to the societal roles that you (and I) want to abolish and to the sex characteristics that a person wants their body to have.