Because you already ordered the iPhone 7, I say try it out. If it works well for you, keep it, and if you don't like it, you can return the device to Apple within a few days.
Personally I did not really like the 6/6s designs. The 7 is ok but I'm not ready to give up the headphone jack until wireless headsets are a bit more mature. So I went with an SE. Should keep me going for awhile since it has the same CPU as the 6s.
I'd wait for the iPhone 8 even if I had an iPhone 5 at this point. The main reason for that is because I don't want another device with the lightning connector. IF we're gonna have USB C in the next iOS devices, lightning chargers will be discontinued as well as lightning headphones. Which means this generation iPhone's would be a poor transition model that took away the headphone jack without replacing it with a real substitute.
Lightning should just go away now that we have a connector that everyone will- and are using.