My suggestion, based on your current use case and the state of the market, is to wait for Coffee Lake to come out and then upgrade to an i7.
Once it does, you can expect to see a wave of cheap used i7s, if not even a price cut on new ones.
Coffee Lake is supposed to hit later this year.