really... lets look at the argument from another direction...instead of using the Room you Identify as, how about this...
If Gender doesn't matter; then All Mens' Rooms (restrooms AND Locker rooms) are Now Unisex... all Previous womens' Locker rooms and Restrooms are NOW for the Handicapped, or people otherwise needing assistance...
is that Inclusive enough for everyone?