Also we can confirm now that Aerith's Knight is Faris. Freya is the Doctor and cannot be Faris.
How?
Sorry, I meant to clarify my post. It's not 100% which of Aerith's Knight or Freya is the Doctor, but it's a 50/50. I believe it's Freya. And it ultimately does not matter who has what role, because both are town.