I think it does make more sense to use Task Force formatting for the contacts. However, the TF contacts have a separate link to their actual missions, so that would mean two articles for each Signature Story Arc: one for villain and one for hero, unless you wanted to split the Who Will Die (and other arcs) page into two sections.
When I created the Who Will Die page, my intent was for people who searched for the arc itself to go there, then go on to the contacts, who were formatted as regular contacts at the time. I think it'd be better to keep the current Who Will Die page as an overview of the Arc, and then have separate pages for the "TF" and the contacts.
Edit: I modified Alastor, and created the Villain-Side Who Will Die page. Let me know what you think.