While I think AMD B550/X570 platform is superior to the current Z490/Z590 Intel platform, my answer is directly responsive to the above constraint. Between R5 3500X and 10400f, stricktly in context of the above statement, I'd go Intel.
R5 3600 is the better option.