I watched this episode while really tipsy which I think was optimal viewing conditions - it mattered very little to me because it was just sort of happening. I agree absolutely though, it was so awkward. I like there to be friction between the Doctor and people (I'm loving Twelve and his rudeness most of the time!) but there's a difference between friction and really angry nasty fights and I think that's the mistake Doctor Who has made before (I love Six but sometimes the exchanges between him and Peri were horrid)