I propose a new division and bathrooms, and new signage to go along with that division:
PENIS ROOM (Boys, girls, men, women BORN WITH penises, enter here.)
VAGINA ROOM (Boys, girls, men, women BORN WITH vaginas, enter here.)
Simpler to just list them as XX or XY.
DNA don’t lie.