To me, a person who is "presenting as" a woman can at the same time be "self-identifying" as being a man.
It happened to me once (I'm a regular dude). Back in college, I grew my hair down to my elbows. Mostly kept it in a ponytail though. Anyways, I was hanging out with a friend in the girls' dorm and really had to pee and I didn't feel like going over the boys' dorm. So, I let my hair down and looked down at the floor and presented as a female, while self-identifying as a male, so I could go use the girls' bathroom and not get in trouble. I even turned around and sat down in the stall to pee. There were other girls in there but they didn't notice.
And it seemed that there was a broad feeling that a person should be able to choose the room based on "self-identity".
Well shit, I chose to use the room based on what I was presenting as out of convenience.