I'm a free agent again after having returned my Note 7 during the recall. I LOVED that phone, but after using the iPhone 6s+ for a year I noticed how a lot of apps I used have MUCH better versions for the iPhone than their Android counterparts (namely Fitbit, MyFitnesspal, Weather Channel, and Storm). Since I use those apps several times a day, it may be worth sticking with iPhone even though I'm more or less underwhelmed with the iPhone 7 announcement (the camera looks rad, though).
On the Note, I enjoyed having the S Pen (hella easy to write down notes and numbers during phone calls), the split screen functionality, the amazing screen, the great camera, all of the extra features of Android/Touchwiz, and I like the form factor a bit more since it's less tall than the iPhone + models.
I'm also planning on getting a new iPad soon, so I'll still have access to most of the app versions I like (except Fitbit), so there's that to consider too.
Decisions are hard, man.