Keep your cpu and wait till 3000 launches at computex in june. AMD Ceo has said in an interview that 7nm ryzen cpus with more than 8 cores are coming. Although she didnt specify he many cores, early an 12 core cpu 7nm ryzen benchmark has been leaked. By design, in order for there to be a 12 core ryzen cpu ther must be 2 8 core modules on the cpu, meaning a 16 core will come. AMDs 3000 series cpus will work with existing Am4 motherboards. You will likely need a bios update in order for it to function, but it should work well with any ryzen 3000 cpu, including ones with more than 8 cores.