What GPU are you using? What is your monitor?
Are you playing at 144hz+?
If not get the Ryzen. Great productivity and can push any game 60fps+ at 1080p if you have a decent enough GPU.
The extra fps won't do you any good if you monitor doesn't have high refresh rate anyway. But the productivity and multitasking gains will be noticeable right away especially if you stream your games.
Now even if you do have a high refresh rate monitor. I would still recommend Ryzen

.
7nm Ryzen should deliver enough IPC boost to reach parity or even beat intel current 14nm chips.
Intel is still struggling with their 10nm process. So AMD will be on top until intel can release it

.
As you mentioned yourself upgrading to ryzen 3000 series will be much cheaper than upgrading to new intel generation.
So yeah 2700x would be the wiser choice.