Well, just got back from the store and said goodbye to my Note 7.
But, on the plus side I was able to keep my S7, they told me I could get any other phone, didn't have to be Samsung, and they would honor the BOGO. Unfortunately, it could only for a phone that was available at the time of the BOGO, which meant no iPhone 7, no V20, and no Pixel if they get it (which 3 other reps at the store said they'd heard rumors they were going to carry it, just weren't sure when). So I got myself a regular sized iPhone 6S. Felt weird getting that phone again, but now I'll have a big and small iPhone and a big and small android, and I was able to keep my freebie S7, Gear S2 and Tab. My other option would've been to return everything and get 2 cheap lg phones so AT&T would cover my termination fees from t-mobile. That would've been $350 for both phones, instead I'm paying $550 and keeping my freebies.
Also, kinda ironic I'm getting all these Samsung goodies for free while Apple is the one getting my money.