Go with Bert above's suggest.
But, if you could, do a little housecleaning (remove old programs, save to CD the old files) and add another drive (perhaps more power-supply) for 100 dollars US your machine might run another two years.
In two years the new Double platforms should be standard and the "bugs worked out."
Unless you are pushed by "a gamer" or don't want to "clean house"....stay with your current system...for two more years....(notice the prices drop, drop, dropping) the NEW (not yet offered) hardware/software will be "miraculus" to the "plub and players" however, it will be a nightmares to "control freaks" like myself.
Sincerely,
Gargoyle