I really don't like Intel anymore. Right now, you could certainly get slightly more bang for your buck. Comparing the i5-10400F to the R5 3600, you would save about 40 bucks, with a slightly(can honestly ignore) better performance. But, you'd need to buy a new CPU cooler for the intel chip. AMDs stock cooler is more than adequate(Should be quiet I heard), as long as you don't overclock. Furthermore, for upgrading, I'd bet AMD will win in the future. Not only are they winning in price to performance(In general, they're Ryzen 4000s are due to be released soon), they include better stock coolers and their chipsets are well, better. Intel has been withholding certain features, just to artificially increase the price of their higher end Z490 motherboards. That's just disgusting and I'd like to stay as far away as possible(Although on your budget, a Z490 would make the most sense). If your willing to wait, just get a Ryzen 4000 CPU when their prices lower. It just makes the most sense to me. Maybe go for a higher end B550 mobo instead of an X570. I don't like X570s, since they have onboard fans and if that breaks, it would be very pricey to replace(Well assuming you use it long enough for it to break). Anyways, just your choice. Would recommend the i5-10400F, but maybe go for an i7 or an OC i5, but it shouldn't be bottlenecking an RTX 2070 Super(Don't bet on it).