Change the signs on bathrooms and locker rooms to Penis and Vagina. Then it doesn’t matter what you think you are or how much you hate your genitalia, just compare what is in your pants to the sign on the door. This is what they’ve forced on us, but it is the only way to end the nonsense (and to make them find new nonsense to force on us).
The folks who have had surgery will get around this one too.
They should put single uni-sex (or two) in places where multiple people gather, like theaters. Explain it does away with heteronormativity.