I would suggest waiting for the beginning of the 2011 when Intel's Sandy Bridge micro architecture CPU-s should become available to public. The new GPU flagships are behind the corner and should also be available by then.
What does this all mean? - You can save considerably on your current components if you buy them in two months time as the prices will drop. Or you could get the latest gear available for the more or less the same price.
Personally, and more importantly - I'd wait for the game specs to be come out. This way you won't miss with your purchase.
