Number 2, a Time Lord.
Will wonders never cease!
And you didn't like Tooth & Claw and School Reunion? Man, I though T&C was great, and even though I have no prior Sarah Jane exposure I thought Reunion was a great emotional episode.
To bad about the play getting bumped back, but It'll be nice to get Beneath Monkey Island wrapped up.