The camera with OIS and improved aperature make the 7 worth every penny of the upgrade.
The 7 / 7+ is where it's at RIGHT NOW ... over the gimmickery of the rumoured 7s / 8 / anniversary edition in 2017.
And coming from a 6, which I admit was a close call for an upgrade, the much faster TouchID gen 2 sensor, non-mechanical Home "button," improved weather sealing and 3D touch are also noticeable improvements.