Clara really is the perfect companion for this Doctor. He's rough around the edges and takes charge, but she has no problem smacking him on the head or saying "sit!".
That was probably my favorite part of the whole episode. The cherry on top of an already fantastic story.
If I made a Top 10 list of Doctor Who episodes I enjoy, this would most likely be on it.