Hi,
If i were you, id upgrade to 3080ti first, since 8700k is still a decent cpu.
About the cpu upgrade, i dont think that 12700k is worth it if you count in the cost of a new motherboard (and possibly ddr5 ram). You can just get 9900k and get away with it, since it doesnt perform that much...