i would get a new cpu personally. That 5600+ would bottleneck any of the graphics setups your thinking of. However, i wouldnt go straight ahead to an i7. get a core 2 quad and upgrade the graphics setup as well with the money you save.
I would do that, but the only problem is that if I wanted to do Core i7, I would have to upgrade again.