I think we're in agreement. A new model with a new name (my 7S reference was a nod to Apple) will replace this troublesome phablet. And be largely the same design.
Laptop, mobile phones and even Dreamliner aircraft batteries have been known to catch fire for a period covering the last 10 years and still the saga goes on.......
It appears that some mobile phone companies are still charging customers the monthly fee even though they cannot use their phone or have returned their phone!
Samsung Galaxy Note 7 - Risen from the ashes - Stuartli
My understanding of the original Notes tending to catch fire was because the requisite 10 per cent safety margin for battery expansion when charging the phone caused the problem (i.e. a design fault).