I think there probably are some number of people out there who are autogynephilic and who may sporadically or consistently present as female due to this (dunno about the other category), but the idea that "all people who don't identify as their birth sex fall into one of these two categories" is just dumb.
Also, my guess is most truly autogynephilic people don't actually identify as trans or try to transition. I'm guessing in most cases they sometimes put on girls' clothes and jerk off, then probably take the clothes off shortly after ejaculating, and just keep it as a private thing, maybe sometimes also doing it with some sexual partners in private IRL/online.