Yep, on the nose with the episode ;)
Despite my reservations when Matt took on the role, he really made it his own and was an awesome Doctor. Moffat made a few missteps - like the iconic TARDIS noise just being "the brakes", and I never really /felt/ the Doctor-River relationship (not with 11 anyways) - but overall Matt's run went pretty well under Moffat, as did most of the first season of Capaldi's run.
After that was when Moffat started to derail the show big time. Tried to be too avant-garde and hip while at the same time pandering to SJW narratives. (Which amusingly backfired on them in a few episodes, lol)