I think you made the right choice, especially getting the i5 at a bargain.
https://i.imgur.com/cwWOj95.jpg
He did say, though, that the i5 was not as smooth as the R5.
In the games they tested the Ryzen 5 2600 was about the same as the Core i5 9400F,and unlike in the US the Ryzen 5 2600 is cheaper here.
The two games which stuttered with the Core i5 9400F were BFV and Kingdom Come Deliverance,and I checked and some other people get the same issues.
We all know hardware unboxed as been criticized for its load of crap testing. I would like to see the clock speeds during testing and ram speeds, the box cool with the 9400f is not good like they said, its poo the cpu will throttle, if you enable mce with a box cooler in would think you will be around stock clocks or lower all the time, I have a cooler on order I can post up some number before and after fitting if you want.
Box cooler is same as with the old i3's.. trying to cool 6cores.
The Ryzen 5 2600 and Ryzen 5 3600 comes with the Wraith Stealth which is a thin aluminium heatsink which also comes with the Ryzen 5 2200G quad core.
This is what it looks like:
https://i.imgur.com/PPB8bmR.jpg
https://i.imgur.com/lGJ92Pw.jpg
The Wraith Spire does cost £5 on OcUK,so its not too much of an extra cost to get a much better cooler.
Better cooling will also cause the Ryzen 5 CPUs to boost higher too,as the Ryzen 5 3600 can boost upto 4.2GHZ but only stays at 4GHZ under heavy load. Its not like HUB are testing under better conditions for the Ryzen 5 3600.
Here is a video testing the Core i5 9400F with its stock cooler and liquid cooling:
It stays at a stable 3.905GHZ in the games tested with both forms of cooling and there is no fluctuations.
Here is a similar test,with the Ryzen 5 3600:
The clockspeed fluctuates between 3.975GHZ and 4.05GHZ,but it seems the average clockspeed is slightly above 4GHZ,as the CPU can't maintain 4.05GHZ for that long,and the better cooling gives you upto 100MHZ more clockspeed. This is not with PBO or any form of overclocking involved.
Even if you were to fix the cores of the Core i5 9400F at 4.1GHZ with all cores boost and better cooling,its only 200MHZ extra,which is close to the 150MHZ~200MHZ extra you get with the Ryzen 5 3600 if you use PBO with better cooling.