That's what I like to hear. I really love that AMD's recent CPU innovations have forced Intel to start innovating again. Now we have 6 core consumer CPUs. I personally wouldn't bother with an AMD CPU, but the fact that they're competing with Intel again really helps us out in Team Blue.
My opinion is to wait as long as you can possibly stand it, and then just go ahead and buy an EVGA card. Chances are if you wait a little while, you'll still be within your 90-day Step-Up limitations to get an 1180/2080.