Sarah and Nick would definitely have been funnier in the hands of a writer like Moffat.

I was kind of dissatisfied with the Thasmin thing as well (not the companion in love with the Doctor bit since that ship sailed long ago) but it felt unearned to me. But I couldn't quite figure out why I thought that since they've been building up to it since at least this time last year.