Been thinking on it some more, if I moved to AMD I would probably go with now a 3700X rather than 3600X, struggling to find the justification on spending more to just go from 6/6 to 6/12, no actual new cores just the benefit of extra threading if I am spending 100s of pounds I may as well get some extra cores, but at the same time the 3700X doesnt seem worth spending on either from my 8600k so I think I may wait at least one more generation as well, and get back into the habit of waiting multi generations between spends again.
One thing for sure tho unless intel suddenly make some large unexpected gains, when I do upgrade it will be to AMD.