The 8700 does look interesting, an extra 2c/4t to compete with Ryzen while still having Intels strong single thread performance - almost regretting the AMD build Ive just bought, but as you said, value for money for what I have now is amazing in comparison.

Maybe wait a month or two until prices stabilise for the new platform and decide then?

Im currently pondering a new GPU, the GTX 960 is now he bottleneck lol. Possibly looking at a GTX 1070 or its inevitable replacement if its out by the time I can afford either.