I'm sticking with the iPhone 6. Having no headphone jack makes the new phone pretty much useless for now, until we can get some decent third-party audio accessories, which is gonna take several months at least (sod earpods/airpods/whatever, I like my ears in their current shape).
It's a pity that Samsung are producing far better phones than Apple are now, and yet, Android OS is utterly terrible compared to iOS. So I get the wonderful choice of either upgrading to crappy hardware or to crappy software. Sigh.