I think your cpu and gpu are relatively well balanced.
Here is my stock approach to figuring what you need to do:
------------------------------------------------------------
To help clarify your CPU/GPU options, run these two tests:
a) Run YOUR games, but lower your resolution and eye candy.
If your FPS increases, it indicates that your cpu is strong enough to drive a better graphics configuration.
If your FPS stays the same, you are likely more cpu limited.
b) Limit your cpu, either by reducing the OC, or, in windows power management, limit the maximum cpu% to something like 70%.
Go to control panel/power options/change plan settings/change advanced power settings/processor power management/maximum processor state/
This will simulate what a lack of cpu power will do.
Conversely what a 30% improvement in core speed might do.
You should also experiment with removing one core. You can do this in the windows msconfig boot advanced options option. set the number of processors to less than you have.
This will tell you how sensitive your games are to the benefits of many cores.
If your FPS drops significantly, it is an indicator that your cpu is the limiting factor, and a cpu upgrade is in order.
It is possible that both tests are positive, indicating that you have a well balanced system, and both cpu and gpu need to be upgraded to get better gaming FPS.
-------------------------------------------------------------
I think you are likely to find that the gpu is the part that holds you back the most.
If you upgrade the cpu, I really think it pays to go with current skylake tech.