today or in the near future; I would look at the Sandy Bridge option. Might not be around yet but from the prices I have seen, much better bang for the buck. A 2500K will whoop a i7's bum. Just a thought.
Until then add ram, and the GPU. 4 gigs is cheap enough, and you will be able to use the GPU with any future rig.