I can't really answer your questions, but for those who are interested, Joseph McMoneagle writes on page 243 in his 1998 book, The Ultimate Time Machine, (which is about remote viewing into the past and future), "You will be able to have your physical sex changed by 2260. This will include hormonal responses, most physical characteristics, and voice alteration. The change will be undetectable." So, there is only a 240 or so years wait, which is a drop in the bucket, historically speaking
I would be less interested in his predictions, were it not that so many of them have already come true, including 911. Interestingly, he writes on the following page, "Between 2015 and 2020, members of a medical sex clinic somewhere in Western Europe will be arrested for genetic manipulation of unborn children. Their goal? To produce a supply of hermaphrodite children to Middle Eastern Brothels." I recently came across information that prostitution in Israel is not illegal. Does McMoneagle's prediction refer to Israel? I don't know, and I don't know if prostitution is legal or illegal in other (Muslim) Middle East countries.
What what gender would these hermaphrodites possess (if produced)? I guess we'll have to wait and ask them, although it doesn't actually say they will ever be produced.
Gene therapy, by one means or another, is already here, and will only become more widespread in capability and use. I would considering using it to change some of my own attributes, depending on what they are, when the therapy becomes available, risk profile, etc.
As for being given the option through gene therapy to alter one's gender, perhaps in some countries it won't be an option, but a forced selection, with no alternative. I think humanity is progressing too rapidly for that to happen, but it's a possibility.