re: What replacement phone are you considering or have you already chosen?
In my view, whether fair or not, the Note 7 has been branded as a flawed device, and if nothing else, its resale value will be affected by that.
If not for the potential safety issues, for the resale issue, if I owned a Note 7, I would take opportunity to return it, since the major providers are given customers the option to do so.
As to what I would replace it with, I would wait until I see how the Pixel and V20 fare when they are released.
The advantage the Pixel phones have is running the latest and greatest from Android, as long as you buy the phone directly from the Google store.
I have a Nexus 6P, and as far as I am concerned it is great. If I didn't have the 6P I would definitely be looking at the Pixel.
The removable battery and memory I really like in the V20, but would need to see its performance when it is released