Unfortunately I have no access to parts i don't purchase, and no unused PSU's, so swapping parts isn't possible unless I buy new stuff. I also added the missing info, i knew i hadn't listed enough components but couldn't remember which i'd missed.
I'm willing to do this, but in that case is...