Upgrading from FX-6300, worth it?

Hello, I'd like to upgrade this build due to my weak CPU so that I can later add a GTX 1060 or 1070 without being bottlenecked.

First of all, is it worth upgrading now or should I wait?

Second, should I upgrade with a Ryzen or Intel CPU? I want to spend the least money possible on this, but enough so that I won't get bottlenecked if I get a GTX 1060 or 1070 later on (I may also look into getting a 144Hz monitor then).

Third, what price range CPU should I look for? And what motherboard would you recommend? As much as I want to save money, I want to spend enough on the motherboard to have a very good one with good overclocking capabilities, good reliability and an acceptable enough DAC.

I thought about getting this upgrade since it consists of parts currently on sale in Canada. Does that seem good enough? Or is there better options or deals you've found?

Thank you!