I agree with those who are saying that gender-neutral restrooms are a good option.

This isn't to say that ALL men's restrooms and women's restrooms should be made gender-neutral by default. What I'm suggesting is that SOME existing restrooms within facilities could be converted/retrofitted into gender-inclusive options where all are welcome, so that everyone has MORE choices as to which restroom(s) they wish to use.