I'd definitively get the i7-4770, which performs significantly better. The only reason to get Ivy Bridge is because it overclocks better. You didn't get one that can be overclocked, so no reason to go for Ivy Bridge. It's also getting old.
You can switch the HD 7950 to a GTX 660 Ti if you want Nvidia.