Just change the signs on the restroom doors:
XX
XY
- Restroom allocation done by genetic makeup.
Also provide a single restroom in a central area - open use.
That’s probably where companies are going to have to go: no more communal restrooms but rather a bank of individual gender-neutral ones. Think multiple “family restrooms,” which are increasingly popular.