I'd wait a few months to see where Intel's 500-series motherboard pricing will settle and for more board reviews to come out, then get an i5-11400(F) with whatever B560 motherboard has everything you need on it. If you have DDR4 in your current system, you can reuse that until you can get something more appropriate (ex.: 16GB of 3200-16 if you don't already have 16+GB) for a reasonable price.