If you really want to wait and see what is intel is going to be rolling out this year I know that the new socket 2011 is supposed to come out later this year. But if your upgrading right now you'll have to also upgrade your mobo as AMD and Intel use different CPU sockets that are not cross-compatible with each other, But I would say get a 2500k with an aftermarket cooler (Thermalright, Noctua, Thermaltake, Cooler Master, and etc. make great coolers) and overclock it up to the specs of the 2600k as I believe both use the same or similar architecture as they were both launch cpu's in the 2nd gen. I7 series.