What would be ideal, I would recommend maybe switching to an SSD , or maybe a M.2 NVMe slot, I personally have the Ryzen 2700X and I am doing fine in FPS wise in Dust II , Mirage and Overpass surpassing over 200+ FPS the whole time.
Your PC is also a good combo for a CPU and GPU, but I would recommend is try to get an all Ryzen system. AKA switch your GPU to an Radeon RX 580 , an amazing card for modern 1080p gaming.