Couldn't we just change all toilets, changing rooms etc into, those who have a pen1s, those who have a vagina and those who have both go to the raspberry one?

That wouldn't be discriminatory in any way, would it? And there would be no lack of clarity with regard to where you should go?