6s+ is a no brainer. Don't know current cost of a 6+ and 6s+.
You could, if cheap enough, get a 6+ and then get the 7 in Sept. Might be able to sell 6+ close to what you paid for it. Or have a backup iPhone.
My 6+ was good. But, the 6s+ runs much better for me and IMHO
If you have to get a 2 year contract for a low price on a 6+, I would wait on the 7. The Note is a good phone. Always liked them. The whole family is going Apple as my one son and his wife have been Apple owners forever. And, I now have a rMBP 13 inch 2015. So, the EcoSystem advantage made sense to me.