Instead of basis bathrooms on "genders" or whatever, why not just base it around the dick-owning status of the individual.
Dick bathrooms and no-dick bathrooms.
And if anyone says this is sexist, tell em that women can have dicks too, and call them cis scum.