I disagree that it "would  make a lot of people uncomfortable and angry".  Maybe they're just angry, uncomfortable people to begin with.

Remember, it is they who have the objections to your sensible solution, "Pick the sex you identify with and go to that bathroom".

Google BuckAngel - who is a FTM trans-person who you definitely would NOT want to force to use the women's washroom.