If you were looking along the lines of a 580, that is the wrong move. The 660Ti is quicker and comes cheaper.
Also, there isnt much of a difference between 2.0 and 3.0 PCI-e. New cards are not quick enough to utilize it yet.
I'd also look into the 7950 or the 7870. Make sure you have the right power supply for these cards though.