OK so taking the current advice onboard, I;ve made the following changes:
I've upped the power supply to a Corsair RMx (2018) 750 W 80+ Gold Certified Fully Modular ATX Power Supply
The RAM is now: Kingston HyperX Predator 16 GB (2 x 8 GB) DDR4-3200 Memory
The SSD is now: Samsung 970 Evo Plus 500 GB M.2-2280 NVME SSD
As for the 2nd drive, Im leaving that as is for now, cause its easy enough to change in the future....
All good?