I would imagine for the iPhone 7 you wouldn't have pre-order promo's like a SD card (of course you wouldn't as it can't be used with iPhone) $200 trade in Credit and option for a $250 watch/speaker right? Do they offer any promo's usually for pre-ordering iPhone's in the past?
Sounds like there's something wrong in your setup. There's no way the 6S would be night and day better that the Note 7. I have had all that Apple has to offer and from an unbiased point of view, the iPhone doesn't out perform the Note 7 ( feature for feature, it doesn't out perform the Note 5 ).
Apple is a solid build with mostly anitiquated hardware that's fueled by excellent software and a very tight eco-system, the latter of which is the reason many flock to Android.
On the topic of Rogers involvement and handling of the Note 7 Recall, I'm indifferent. Likely because I had no expectation of Rogers in the beginning. I know they are very quick to communicate from a Sales perspective ( e-mails, phone calls, text, etc... ). I don't view Rogers as interested in my well being unless they can make $ doing it. They really have never been, in my eyes and through my experience, concerned with what's best for me. So, in the end, Rogers was consistent in their handling of this situation.