I haven't seen "Time Crash" yet, I'll have to get around to that. Generally speaking I'm not too hung up on plot either, but since I watched all of s2 and s3 pretty much in two weeks, I suppose the similarities started getting to me.

Moffat seems pretty damn sharp, yes. "The Girl In The Fireplace" and "Blink" were both great.