If you're looking to upgrade your CPU/Motherboard, I'd wait and see the prices for the intel 11 gen CPUs which are scheduled to come out at the end of this month.
Have to wait and see what else comes out on it but so far this is what I'm seeing on the intel front.
Early leaked i7-11700k benchmarks leaked