Seems to me that you simply have fallen into the ''grey'' area after accepting that your feminine innhibitions are a part of yourself. Sadly enough, the social constructs we live in are built for black and white contrast.
Stop trying to label yourself and instead ask yourself: What makes me happy?
For example, I am quite happy dressing with female clothes, shaving, acting feminine and wearing makeup, but I don't care about passing at all. I don't long to be socially accepted as a female, because I feel that what I am doing is right for me and that I shouldn't have to wear a mask over it.
You seem confused because you want to fit like a piece of a jigsaw puzzle. Instead, you should wonder if these other pieces fit into your puzzle.
Personnal happiness should be your goal.
''Walking the brush is just as good a path as any... Except that it leads to unexpected places.''
-Buddhist pilgrim