With your current usage this particular i3 won't make you think so even more than in 3 years. It's more powerful than i7 in, say, MBP 15" 2015 which is a machine which still can be used for many kinds of professional work just fine, it could be a perfect machine for your needs performance-wise.I'm willing to spend some extra $ to not worry about finding myself in 3 years muttering "damn, I should have gone for an i5!"
You won't gain a lot from having two additional cores of i5 due to the most of the time you'll be waiting for single core tasks or IO (network, disk) anyway, except for maybe Lightroom which probably uses more cores.