I think the way we view gender dysphoria is likely to change in the future and we will probably try to disentangle gender and sex.
I've always wondered why we must see it as a physical affliction and focus on the body. If it is about a mismatch between brain and body, why not try to fix the brain? Especially because it simply cannot be a good idea to pump someone full of hormones his or her body isn't suited for. We see men having disorders because of estrogen pollution. Why then do we believe it will do wonders for their bodies if we provide them with large quantities?
I've also always thought it was so poor from an intellectual point of view to make your entire life depend on your sex. I'm happy I was born a man, but surely I could have done pretty much anything I wanted as a woman too.
And then, finally, as awful as I may sound, you don't become a woman through plastic surgery and hormone treatment. That's not how sex works.