Guys, don't worry. It was the Doctor himself in that room. We already know from the last season(dream lord) that there is no one who hates and fears him the his own self.
I loved the whose-God-complex-was-it-? twist. It seems to be quite the running theme, no? And also, does anyone else feels that constant timeless suicide-killer vibe coming from 11?
(BTW whose was that clown??? You know when Amy and nurse hid in the room from Taurus?)
Still waiting for Doctor/Song romance scene.
EDIT: I'm sorry, but how could you NOT notice the greek myth reference? A Taurus? In never ending halls, you know, like a labyrinth?