I got the Note 7 on a plan around Sept 2016 (when it came out) on the basis I'd have the early upgrade after 12 months for $99. This was a big thing for me since these new phones tend to start playing up after 12 months (happened to my last 2 "smartphones")
At the time of the recall, I didn't want to restart the 24 month clock again with the S7, but needed a phone in the interim.
Long story short, we agreed that I would re-contract with the S7 but the "clock" would be wound back to when I started with the Note 7, so I'd still be able to upgrade to the Note 8 when it eventually came out. They told me (in writing) they would adjust the "start and end dates" to do this. Lo and behold, they haven't done anything and goodluck trying to get a hold of them to update their notes.
You're most welcome to PM me your details & I'd be happy to look further into this for you.