At this point in time, i'd say Nvidia.
ATI used to make damn good cards (see 9*00 series), but now they're employing tactics which Nvidia have used in the past, which i consider extremely lame.
Really, if you want a future-proofed card, which will do what it needs to do from day 1, go for an...