Thanks for commenting. :)

I definitely agree there's quite possibly a Moffat trick in here. As I said in the beginning of my thoughts... Moffat's episodes are never straight forward. And I love that about him.

So if I'm completely blind-sided and going down the wrong path with this, the reveal becomes even more fun for me. :)