It makes much more sense as an early episode. I was thinking it was a bit insensitive for the Doctor to be making Flesh jokes, but if it was supposed to be a subtle hit that would be better.

Until further notice, I am going to assume timey-wimeyness.

As shall I.