You want some brilliant non-Who Moffat? Netflix/rent/download Jekyll (the guys in my avatar and sig). I really think you, of all people, would enjoy it...