I was appalled to read about that. I had replaced my 6Plus as soon as the 6SPlus was released because my 6Plus was just not very good. It lagged. It glitched. I never warmed up to it and decided I would stick to the S cycle from that point onward. But now the IPhone 7 looks like an even further refinement of an S cycle model in some respects. My 6S Plus has been excellent.
If I were in your shoes and wanted to stick with Apple and the larger phone, I'd either go for a 6S Plus on a discount or the iPhone 7. I'm not sure I would trust an entirely newly designed iPhone 2017 model at this point. It's rumored to be their first foray into OLED and an all glass design combined into the equation, so who knows how that will get screwed up. After reading about how Apple is handling this Touch Disease problem and censoring discussion about it on their support forum, I'm not as confident in them as I once was. I didn't ever think they would let quality or support and service slide for their cash cow.
That's their poor design causing problems for their customers who paid hard earned money and a premium for the Apple name and reputation. If they can spend billions on some Uber-like venture in China or invest in some crappy reality tv program, they can make this right for their customers without being slapped with a class action lawsuit.