Apart from that, which I totally agree with and have no clear answer to, is the fact that the Doctor that comes out of the restroom is supposed to be some 200+ years older than the one that was just killed (impossible astronaut) which is the one in "our present" and that is going to -apparently- die in Lake Silencio. He's already saying his goodbyes in a way, even to the three unknown children at the end of the last ep.
I'm missing those 200 years somewhere in between.Still trying to figure out that one...must think fourth dimensionally I guess.