No, I agree, your first example ('my body feels wrong and I know it's a delusion', etc) would be a requirement for potential based-ness. Personally, I'd extend that to cover those who lean into dressing/living as a woman if they're prepared to live with the social consequences of that (judgement, difficulty finding employment) and don't expect others to validate them. The honesty, self awareness and personal responsibility is the important part.