The Ryzen CPUs aren't the best gaming CPUs. Generally speaking that accolade belongs to Intel's line-up. What the Ryzen CPUs are good for are multi-threaded applications which some games may be able to take advantage of.
As for bottlenecking? Personally it isn't really something I concern myself with (hence the wrong person to address it), because there is likely a bottleneck in any system - it isn't limited to the CPU and graphics card. I prefer to think of whether the system is well balanced.
When considering the graphics, then the monitor refresh rate should also be considered. I'm of the mind that if you have a PC which can produce 200 fps in a specific game, but only have a monitor with a refresh rate of 60 Hz; then it's poorly balanced. Those sort of calculators can only give a generalisation at best, so I would take it with a pinch of salt as it were. Better to find benchmarks of the software you use for a better picture and understanding (in my opinion).
That said, the RX 580 is approximately at the same level as a GTX 1060. The two cards are fairly even (with variations across games), and the 1060 is considered to be a good 1080p card. If the performance you are currently getting now is satisfactory, then I would say there isn't any need to be concerned about bottlenecking.
That also said, what would the purpose of upgrading the CPU be? While more cores is better for future proofing, it will depend on what applications you plan to use which can take advantage of it. Gaming development is slow moving, and I suspect it will be a while before we see all these cores being properly used in the majority of games.
We'll likely see the next generation of Ryzen CPUs before the majority of game development truly optimising for multi-threaded CPUs. Games are still reliant upon a good IPC (the advantage Intel has). While there is some difference between the 1400 and the 1600x. I don't think it's worth the upgrade for current gaming, but again it will depend on the applications you're running.
Sorry, not a great deal of help.