Thanks for clarifying that.
I'm not sure what the exact PSU is, seems I might have to open it up to check that. My system model is MS-7816, I got it from Mesh Computers, it's quite old I bought in 2014. Will get the exact PSU and update.
But as you say I may as well hold off until those new...