I think you should wait till Q1 08, for the new gear.
If you can't wait, I personally would get a Q6600 GO, and an 8800GT. The new GTS isn't that much faster evidently, and yet it is quite a lot more expensive. So I would get a GT and then sell it next year and get a 9800.