I cackled when Ten sees Eleven's sonic and says "Compensating?" My thoughts too, Ten!
Haha, yes! Definitely one of the best parts of the episode. Two such brilliant actors and so much charisma and chemistry!

I agree about Osgood and Moffat's stereotypical way of writing. Not that we aren't used to it by now, but still quite infuriating.

The plot was much less of a hot mess than a lot of Moffat's episodes for the past two series.
I thought so too. Some things about how Gallifrey was saved made no sense, but sometimes I just choose to ignore logic and trying to figure things out and focus on the parts I liked :p

I am looking forward to and dreading Christmas in equal measure...