This is probably my favourite so far this year too, for the reasons you mention. It felt a bit like a McCoy story, with the story already some way along when we join it and with more independent companions being sent off by the Doctor to have their own mini-adventures. Also the environmental message wasn't as clunkily delivered as in Orphan 55.