Here's another option. How about the 1700x? Still 8 cores, and closer to the price of the 1800x. Take the money saved from the 1800x, and get a nice cooler and overclock.
That said, if you are gaming, probably the 2600x. If you do more multitasking etc, the 1700x/1800x. What do you use your system for? I think in the next few months, somewhere around May or June, they are supposed to release the Ryzen 3000 series, which should be Ryzen 2. So should be a nice performance bump. Depending on what you have now you may wait.
Last idea, this is useful if you have a microcenter nearby, everyone else seems higher. My local Microcenter has the Ryzen 5 1600 for 120. If that's an option, you could pick that up, a nice motherboard, overclock the 1600, stay with it a few months, then upgrade in a few months and sell the 1600.