S7 edge
+ Display ("5.5 and QHD)
+ Design (a 6s edge+ rehash or iPhone 6 rehash?)
+ Camera (Samsung is surpassing Sony modules)
+ Battery Life (could be a push although S7e has QHD)
I don't think the iPhone 7 Plus is even par to the S7 edge. It is 2016. Get on VR now. Don't be stuck on 1080p or 750p forever. People will eventually move to 4K next year since most people will also start owning 4K TVs. 4K will become the new standard which is why Microsoft and Sony tried to prepare itself with their console mid-life upgrades.
The iPhone 8 Plus probably won't beat the Note8 either. Doesn't matter what design it has. Since the OP happens to be OS agnostic, we throw out the OS and judge them based on hardware aspects where software updates generally can't correct it. These are areas where Samsung usually wins. I would've preferred the Exynos variant of the S7 edge but the Snapdragon 820 can hold its own.
Why would anyone attack you, OP? If they are being attacked, fanboy alert! Disengage now.
Personally, waiting on the LG V20. Probably get it on October 20 to go 10-20. I could get it on Oct 17 but I use the date I got it for my passcodes. The 20th also matches my anniversary with my gf who happens to be an LG fangirl. V20 is more smudge resistant and less laggy software as Samsung. Not stuck on 750p/326 ppi for next two years when 4K becomes flagship standard next year..
Remember, iPhone 7 will be in retail stores until 2019. You can still pickup an iPhone 5s now in stores and as prepaid while Note 3 are long gone.