Okay, just to be clear, the difference in gaming between a i5 4690 and the 1600X is not going to be that big if at all....So do think carefully about the next CPU to upgrade to.
If it is pure gaming you are after and at 1080P, then the 8600K/9600K at the medium end would offer the most performance coupled to the RTX 2070. The Ryzen 2600 will also be good though still behind the Intel side and in some games by a fair bit...though much better on the productivity side..