That's basically what I did, along with the new PSU, but thats still a lot to spend on a hobby/luxury, unfortunately, so I can't really afford to tinker with it more than that.