i´d stick to the fx 6300, too
if you upgrade that, go intel, but i don´t think it´s necessary
with any luck, there might be another generation of cpus coming for socket am3+ mobos,
that might be worth an upgrade then (i´m hoping for it)
i´d wait until then,
if it doesn´t come, you can still go...