Everyone has a choice to buy of not. There will always be the 7S and 7S+ or stick with what you have.
You're right, I don't mean to sound overly picky. I'm just concerned about how much the price is meant to hike, when the Samsung is so much cheaper. I don't think I'd go for the 7s, I'd be happier to pay more for a much better product, just not sure how much more I'd be willing to pay. At the end of the day it's just a matter of waiting to see what it brings to the table. Is the 7s confirmed?