@Grim
Few suggestions from my end;
- Both AMD and Intel mobo/socket are near EOL. With AMD B550 mobo, if you get 3000 series proccy(Zen2), you would have option to upgrade to may be 5000 series(Zen3) or Zen3+ refresh. Zen3+ refresh is not yet confirmed but widely speculated to happen this year. With AMD B450 mobo, not sure if Zen3+ would be supported. Zen3 is about 20% better in gaming and 10-12% better in applications than Zen2. With Intel B460 mobos, you might not get 11th gen processor upgrade possible (It is possible with mobos suchs as B460M DS3H V2). With Intel B560 mobos, you can upgrade to 11th gen chip.
Now if you are going to keep system for 3-4+ years, I would suggest to ignore upgradability and get most VFM parts now. But if you want to shuffle processor say may be couple of years down the line, think of options with open ends.
Another point on processor selection between AMD R5 3600 and Intel i5-10400F; if your main purpose is gaming, get Intel processor. It is cheaper (13.5-14K vs 16.5-17k) and performs same as R5 3600 in games while being 10-15% slower in applications. You can pair it with 2666Mhz RAM as well - may be saving some bucks there. Also make sure to get 2*8GB sticks.
On SSD, You could swap Silicon Power one with WD SN550 drive. Both are comparable in performance with WD being cheaper (9.5K vs 8.7k).