I will say this though, my experience today was that it indeed had to be returned and then done as a repurchase - I had to give up my JOD because I was out of upgrades, so I got switched over to regular Jump - Not what I wanted but I was too tired to even care at that point. I did have to pay the tax on the Edge but I called TMO customer service and they were more than happy to just give me back that money as a bill credit - so that was a wash out. The lady at Tmobile gave me a free LED Wallet case AND fast wireless charger to compensate for my trouble, so that was cool. I still get to keep the Gear Fit 2 that I got with my Note, and now I was able to order a free 256 gig SD card ($200 value) with the new Samsung promotion they just stated for S7 and S7 Edge purchases.
So basically, I had to go from Note 7 to Edge 7 - basically its the same phone minus the S pen and USB C - I technically didn't pay anything and what I got out of the deal (for free) is a Fast Wireless Charger, LED Wallet Case, Gear Fit 2, and 256 gig SD card. That's more than fair for the trouble this situation caused.
So I mean, yeah, part of this has been a huge inconvenience, but I'm overall happy with the Edge 7 and I do feel like both Samsung and T-Mobile did everything that they could do to make this right. So I'm fine at this point.