No.
You made an unfortunate choice if you ever intended to upgrade.
You buy a APU for the excellent integrated graphics.
But, there are no real good upgrades, particularly for a gamer.
If you install a superior discrete graphics card, you will have thrown away the big advantage of the APU.
Then, you are left with a relatively weak cpu. Most games depend on only a few fast cores.
The possible upgrades are to more cores, but few games will use more than 2-3 cores so 6+ cores are not very helpful.
Bottom line.....
What you get with a APU is what you will live with forever.
FX-6300 would buy you two more threads, but few games can use more than 2-3 threads.
And the FX cores are even a tad bit slower than yours.
If you need a cpu upgrade, I suggest Intel i3-6100 since you have dedicated graphics.
Here is a review.
http://www.anandtech.com/show/10543/the-skylake-core-i3-51w-cpu-review-i3-6320-6300-6100-tested