Go with an i3-2120 and an asrock z68 extreme 3 gen 3.
Agreed. Switch to an intel-based build with the i3-2120. I had an AMD FX-6100 (6-core variant of the one you picked out) overclocked to 4.0 Ghz. I switched over to the i3 and my life has been pretty awesome ever since. Even Windows boots up about 20% faster.