The Ryzen will in turn be a lot better, than an i7-7700K at multithreaded workloads, so if you plan on getting a completely new system anyway, that's what you should do, and then keeping the Xeon until then instead of the i3 makes more sense.
I recommended the i3 -> i7 upgrade because I thought you wouldn't want to spend much - if anything at all - on upgrading, the i7 would be the most cost-effective way, but weaker than the Ryzen.