What's wrong with your current setup that you need to improve upon?

If it were me, I would just save for an entirely new system and buy it when I had enough cash. You might as well upgrade it all since the technology is constantly moving forward.

Then start 10 boxing :P