Well that same Saturday, I went to the store and was debating between fixing it, replacing it with another S7 Edge or move on to the S8+. I really wanted to hold out for the Note 8, but Miss "I'm throwing you a curve ball" Life lady got in the way. So I now have the S8+.
Ironically, I didn't think much of the S8 or the S8+ when they were unveiled, but after using it for a few days, I have to take back my words and say, it really is quite impressive.
TS