Unless you're feeling too burned by Samsung, the Galaxy S7 Edge is still a fantastic phone. It's essentially a smaller version of the Note7, without the stylus, iris scanner, and tendency to catch on fire.
It's currently my daily driver, and I still recommend it to anyone who asks. The camera is fantastic, particularly in low light. Nougat is unfortunately nowhere to be seen yet, but if you want to stick close to a Note7 experience it's worth considering.