Love the way your thinking is going here! I remembered about that TARDIS from the Lodger too, but forgot about the one from The Impossible Astronaut. There's also an interesting comment from River Song in "Angels Take Manhattan" that "one psychopath per TARDIS" is enough.