Need help to upgrade

I’d go something like this:

https://pcpartpicker.com/list/XcfJ4q

Huge OC headroom, specially if you delid your 8700k (you can send it out if you’re not comfortable). Case is left empty since a lot of it personal preference.