This may be an unconventional take, but I think society would benefit greatly if people stopped seeing sex/gender as something you are, and rather saw it as something you have. I.e., you happen to have an X or Y chromosome which lead to a certain anatomy and hormonal profile. Seeing it as some fundamental component leads to "othering" of the opposite sex and its predictable consequences.
I'm personally hoping that radical advancements in sex reassignment technology, along with their acceptance, will eliminate most of the ideological battles concerning sex and gender.