I think at some point language as a whole will shift. Most languages have had a concept of masculine/feminine and differentiating between genders for most if not all of their history. This seems pretty weird as a concept in modern times since it serves no real benefit. If we were to develop a language from scratch today I don’t think it would have such features.
Its going to take a pretty long time (hundreds of years) but language is constantly evolving. I think it will get there. In the meantime things are going to remain at least a little confusing.
I have a few transgender friends and its still a bit if a mental hurdle to see them as who they want to be identified as sometimes. I sometimes slip up and will call them by their old name or use the wrong pronoun. It’s never intentional of course, but sometimes my mental auto-correct isn’t working at full capacity. If I meet the person post-transition then its never really a problem as I always see them as that gender.