Assuming it doesn't explode of course, the Note7 battery still won't be as good as the S7 Edge as it's only got a 3500 mAh battery along with a slightly bigger screen.
You can wait forever until the next "best" phone comes along.
I say jump in and get an S7. You won't be disappointed.
And in any case, within the next year or so, all top-end phones will more than likely come with the new state-of-the art Lithium Metal batteries, which double the battery life (or half the battery size for the same comparable capacity....the choice that companies make (ie. life or size) remains to be seen.