Upgrade path From FX 8350

hftvhftv

Distinguished
Ambassador
CPU: FX 8350 @4.7Ghz 1.5V
Mobo: Asus TUF 990FX R2.0
RAM: 16GB DDR3 1600mhz
GPU: GTX 770 4Gb
CPU Cooler: Swiftech H240X with Noctua Industrial 3000RPM 140mm fans.

I’m currently with this approximately 5 year old setup and even though I am able to play most games at 1080p 60FPS I’m looking to upgrade my general platform. I’d like to overclock my next cpu again as I do have a good cooler, but I’d need a motherboard that has sufficient VRM cooling to supplement it. I think I’d either get a new Ryzen 5 or a 9th Gen i5. Any thoughts on what would be the best upgrade?