Thanks for the information. After thinking about this more, I'm thinking of just starting a whole new build for the dancase and sell the old rig to someone as a complete turn-key unit.
So, that said, I'm now considering going with an i5 8600k and de-liding it (it doesn't seem to bad after...