The companions should be Jeff and Steve from Coupling... I'd be willing to stretch to Jeff and 'as-yet-unknown'. The world needs more people to be aware of the giggle loop and the sock gap.

(I don't think Ianto's a good choice for the TARDIS. he'd never be able to finish cleaning it, and what's the point in a teaboy that can't clean?)