Yeah, everyone I know with a remote familiarity of Doyle's works and hearing the name "Vinnie Jones" immediately pegged him as Moran. And titling the episode "M." and then deliberately not mentioning Moriarty for most of it? That was such an obvious "There's a twist coming!" broadcast.