The closer July gets, the more motivation to wait, IMO...
(I'd be VERY interested to see what RYzen 3000 brings to the performance table!)
Unless Intel has their newer 14nm+++++++ process down to voodoo -science levels and reserving best silicon for the newer models, I don't see jumping to 10 cores and possibly tweaking clocks to 5.1 GHz as being all that big a leap forward; in fact, jumping to 10 cores, I'd expect them to have to lower base clocks by ~100-200 MHz across all cores on average to meet TDP goals...