Question Should I upgrade from B150 M board and i5 6400?

Sep 10, 2019
Need your recommendations on the following:

Mobo: MSI B150M Night Elf
Processor: Intel i5 6400
GPU: Palit GTX 1050 Ti Dual
RAM: 16GB (8x2) 2400Mhz Adata XPG D40
SSD: 256GB Adata XPG SX8200 Pro M.2 NVME via Asus Hyper M.2 x4 Mini PCIE Expansion Card
HDD: 1TB Seagate Barracuda
CPU Cooler: CoolerMaster MasterLiquid Lite 120
PSU: SilverStone 500W Strider Essential 80+ Bronze

I am thinking of an upgrade to my current rig. Upgrade mobo or processor or GPU. I believe I can still use the rest should I upgrade the 3.

Is there a need to upgrade? No serious issue with the current rig. Mostly used for gaming also. No issues with gaming and I plan on 1080p gaming only. Rig can be used on CADs and Adobe.

Am leaning on B360M or mini ITX board + i5 9400F. If budget allows, maybe upgrade GPU to 16 series.

I know the 2400Mhz is too much for B150 boards and 6th gen i5 clocked at 2133Mhz also. Am after the 16GB dual and I think I can still use current RAM with future rigs.

Or should I go with AMD rig?

What are your recommendations?