I never remember if a trans-woman was a man or woman originally. So, how about "now-man" and "now-woman"? Regardless if they've transitioned once or flipflopped or whatever, they are identified how they want now, also indicating that they weren't before.

Regardless if they are now fixed and sane as most, or if they're as confused as ever, the chance that they may appear different or confusing is not small. Having these clear unique labels for them can help the majority of the population in this. If some people are mean and abuse the labels, that's on them. Most people simply won't give a shit. And of course there's currently no shortage of support for these different folks, with and/or without issues.