If your plan is wait till the end of the year, asking for advice now is pointless.
In the CPU front, Intel will launch new CPUs that will replace the high end socket 1336 (i7-920/930, 950, etc.), and AMD will launch Bulldozer.
In the GPU side, both AMD and Nvidia will surely launch new card by then, and this time they will be based on the 28nm procces instead of 40nm, so you will get a lot more performance with less power at the same price or even lower.
With all this said, if you want to upgrade by the end of the year, ask this again in November.
Please excuse my bad English.
Former gaming PC: i5-4670k@stock (for now), 16Gb RAM 1600 MHz and a GTX 1070
Current gaming PC: R5-7600, 32GB RAM 6000MT/s (CL30) and a RX 9060XT 16GB
Steam / Live / NNID : jonxiquet Add me if you want, but I'm a single player gamer.
