I think my first reaction at the end was 'Thank goodness, an episode of Dr Who I can actually like in its entirety'. Thank you John Hurt.
Now post-Christmas Capaldi's Doctor can stop treating his Companions as puzzles to solve in order to distract himself from what he himself is. I've the impression Moffat was writing himself into a corner and can now breath easily again. Questing for Gallifrey allows far more adventures across space and time.