You guys are overthinking this.
Put yourself in Heller's shoes. As a head writer, you can't plan too far ahead. Only two suspects of the seven appear in Season 1: Partridge and McAllister. Now that Partridge is out, only McAllister remains.