9800 pro is a real toss-up, I would say no, don't upgrade now, wait for the next gen. I have a 9600 pro and it was still a close choice, but I did upgrade mainly because I could call it a Christmas present to myself. Even with the lowely 9600, I have been able to play every game recently (including Doom3, though at 1024 with med details).
Stick with the 9800 pro till you can pick up a X800 pro or 6800GT for $250 and laugh at us who payed $400+
-spike