Should I just make a new box with upgrades (like pull out the 8800 etc) and use my current machine as another slave so I can run more games easier.

And for upgrading my CPU i do need a new motherboard right?