Like Chirone said, you should probably go with the ATI if you do want to upgrade. AMD usually beats NVidia and if the price is right you should go for it ...
BTW, from my experience, if you choose to upgrade you should take just about the best thing on the market (before extreme unless you're swimming in cash and it doesn't sound like it ) in order to postpone the next upgrade as much as possible.
Benny