Upgrade Recomendation

Just wanting an opinion on an upgrade

Current system:

-evga 680i mobo
-core 2 duo e6600 @ 3.6ghz
-4gb (4x1gb) DDR2 800
-8800GTX
-650watt psu

I'm using a 24" monitor that runs at 1900x1200.

A few of the games I'm looking to play in the future: Diablo 3, The Old Republic, Borderlands, Huxley, Mafia 2, Modern Warfare 2. I don't need to play these at highest settings with 4x AA, just medium at native resolution at a constant framerate.

So what upgrades would get me another couple of years out of my computer, or should I just wait and build a whole new one in a year or 2.

If your on a budget I recommend this card http://www.newegg.com/Product/Product.aspx?Item=N82E16814150359

Aside from maybe a video card upgrade (when those games are released), your current system can likely handle all that.

Upgrading from a 8800GTX to any new card out now is almost pointless, because all most of games will be based around Console graphics which is a easy job for a 8800GTX. And I would wait until the new Dx11 cards to come out before upgrading.