Both guys are terrible, but i'd choose Teddy purely because he can actually do his job no matter how predictable he is. Johnny isn't even entertaining in a good way, more so of a case of "I can't wait to see how many lines he flubs tonight in his god awful smokers voice."
Fuck those two
Bring her back.