You could wait too, Check this out,

http://www.razerzone.com/christine

Razor is working on a new PC Concept for a 100% modular Computer. If they do it right it will be in such a way that you can install the OS one time, and swap your OS drive from one to the other. E.g. You can upgrade it module by module, forever. Eventually upgrading the trunk.