Question Budget Build for a Freind

Sep 8, 2021
Hi, I'm helping a friend upgrade his pc. He currently has an i5 3470 with 8gb ram, 240gb ssd, 500gb hdd, 300psu, and an rx 460He wants to upgrade to ryzen 5 1600x or af. He would need to upgrade the motherboard for about $60 and 120ish on the Cpu and another 60 for ram and probably a new PSU (what do you guys think) and carry over the case, storage, and gpu. We were discussing if he should wait to save up for something better. We were thinking to wait for 12th gen intel to release to push the prices of 10th gen down and go for an 10600k or a ryzen 5000 series and a 10 or 16 series card in a whole new pc. Except he's gonna reuse the ssd and maybe hdd. So my question is upgrade now or wait
edit: incase you are wondering he plays Minecraft and valorant and is hitting 60+fps in both but wants to get into more games and maybe streaming and higher settings and fps
It would be better if he could stretch his budget a bit.
ASRock B560M PRO4 $99.99
Intel Core i5-10400F $144.35
DEEPCOOL GAMMAXX 400 CPU Air Cooler $24.99
TEAMGROUP T-Force Vulcan Z DDR4 3200MHz 16GB (2x8GB) CL16 $67.99 Pro4/index.asp