I've seen a lot more single toilet "family" bathrooms in conjunction with the traditional male/female ones. Having those in most places seems to eliminate the need for this debate entirely while also providing a place where people all of gender identities feel most comfortable.