Now is not a good time to upgrade to a new system or even upgrade the CPU.
Reasons why full system upgrade is not very good:
You need a new board, DDR4 RAM in addition to a new CPU. And DDR4 RAM is very expensive now because of mining/mobile phones. Older boards are also very rare to come across.
Wait a while longer.
As for upgrading to a faster, more cores FX: The best you can go is the FX 9590, which is 220W and has the multi core performance of a stock, locked i7 6700, single thread of a i7 7500U laptop. And needs expensive 240mm+ liquid cooling.
I suggest you invest into buying a high-end AIO cooler with LGA 1150 (latest Intel) or PGA 1331 (latest AMD AM4) sockets. So when the time is right you can use the liquid...