But you've made this same argument for a few years now. Android has been superior to iOS in your eyes for quite a while. You were pretty glowing in your assessment of the S6. Didn't see the iPhone customers migrate in droves then. I don't think the S7 offers anything revolutionary--same Android, very similar hardware to the S6---that will all of a sudden open the eyes of iOS users. You're allowing your own personal preferences and assessment of Android to cloud the argument for other. Millions of iOS users didn't see Android as more useful, functional, or care about the expanded ability to customize last year. Nothing in MM is going to change that if it didn't in lollipop.
Battery life has really never been an issue for my on my iPhones. It's great to be able to have all day battery performance--an area where the iPhone 6S+, Apple's equivalent to the S7 edge, doesn't underperform. The standard size iPhone isn't as good and could use a bump but I don't recall seeing it as a massive criticism either, at least nothing like the standard S6 suffered from last year. Again, if battery life on the iPhone had been a problem, the exodus would've happened a while ago.
But again, this isn't a new issue. Android didn't just gain these new functionalities. If this was a significant problem for iOS users, shouldn't these deficiencies have caused that shift away from the iPhone a few years ago? What is so revolutionary about marshmallow that now longtime iOS users will leave?
To be clear, I'm not disagreeing with most of your points--there are many things I'd like to see improved in iOS and the iPhone. I'm only arguing from the perspective of the typical consumer. I don't see the big revolutionary change coming because of the S7 models. Yes, they appear to be doing better than last year's models and rightfully so as they're by all accounts better phones. But most of these arguments have been pertinent for at least a couple years now. I think you and many here have a higher standard of expectation than most consumers. Their minimum needs/requirements in a smartphone are far surpassed by both the Galaxies and iPhone.
If the iPhone 7 comes out and is just more of the same that we've seen from Apple for the past few years, maybe it will be the tipping point. Let's revisit again about a year from now and see what's happened.
And I'll be honest...I really hope Apple does suffer a bit of a sales/profit setback this upcoming year. I've been a bit frustrated by their stagnation and practices (the pricing for the iPP models and their accessories is simply ridiculous, IMO) and would like them to suffer a nice, swift kick in the proverbial behind to realize that they are not going to be able to ride this financial wave forever. I'd rather see them adopt a bit of a proactive approach rather than wait until their bottom line suffers but sadly don't think that's going to happen so...kick away.