Yes, you're right that concentrating on each two-parter in its own right, without the frustration of a longer arc that is crow-barred awkwardly into each story and will probably only disappoint in the end, is a definite improvement! It's certainly nice to be pleasantly surprised for the time being.

I'm glad to hear the Captain is enjoying it all too. I sometimes worry that New Who has become rather too complex and scary for small children to enjoy in the way that we enjoyed the Classic series as kids, but I'm glad those things aren't insurmountable barriers for him at least. I imagine Under the Lake was pretty much on the edge of what a child his age can handle, though. Has he seen that one yet, or are you keeping it off his radar?