IMO, you should just stick with it for a little longer... save the money and when your system cant take it anymore just do a complete gut job...
because if you change now, the rest of the system will be the bottle neck... unless you go for the 8600GTS or GT...