Thanks for the feedback, unfortunately the machine is needed quite urgently, so I havent been able to change it up too much.

Upgraded the CPU and downgraded GPU somewhat.

Happy with it for now, will definitely be upgrading it as finance allows.