GPU Upgrade recommendation

I'm looking for recommendations on upgrading my GPU. My main concern is making my CPU a bottleneck and not using it to it's full potential. My specs: Q6600 @ 3.0Ghz, 3GB ram, 8800GT 512MB. Would it be worth upgrading the GPU, if so what would be the best to go along with my CPU? Should I not even bother and wait until I can afford to upgrade them both? Thanks

Wait a couple of months and the new cards will be out, but if you really need to upgrade get a GTS 250.

Your CPU isn't a bottleneck, but you could OC it a little.