you should wait for the new i5 unlocked cpu (aka i5 3500k)
I want to wait for the performance increase since I'm not in a rush, but I don't know whether I can get the same deals. (On mobo/cpu)
As for the 480, I will look into it. I thought the 7850 would fair better for newer games and be more future-proof.