I'll be honest...
...the Note 7 issues isn't the reason I wouldn't really be tempted into another Samsung phone (although having briefly played with a friends S7 Edge, from a hardware perspective it seems to be excellent).
No...it's their lamentable support and approach to security updates.
I actually think, personally, that Samsung behaved impeccably with their recall(s). First there seemed to be a battery issue which they recalled and tried to fix. When it became apparent that there was a deeper issue, they recalled, full stop.
None of that crazy "you're holding it wrong" kind of attitude.
So I'm not so sure how damaged the Samsung brand is or how much of it is hyped.