I was in the similar perdicament with my setup, thought about changing. I'm probably going to see how Sandybridge E compares and pricing when launched in the comming months (not 100% certain when).
Are you running overclocked at all, I have mine at 4ghz without any issues.