I got my rift on the same setup as you, 920 was overclocked to 3.4ghz
I went to a 1080 first and it made some difference but I was getting stuttering every now and again, so took a jump to new platform AMD 1800x and this made it much smoother.
I would go CPU first, you are running 10 years...