GPU without question. 920 can (and should) be overclocked to 4GHz. Actually it's almost criminal to run this CPU at stock speeds.
At 4GHz, the fastest CPUs out there are not that much faster. Probably not enough to be noticeable in games.
It's something I have recent experience of, because I upgraded my i7 920 to a 2700K. This was out of necessity rather than intention, because I killed my 1366 mobo in a botched upgrade. The difference? Nothing whatsoever. My GPU config at the time was 560 Ti SLI.
By upgrading your CPU you'll see no benefit. By upgrading your GPU you'll see a huge difference. Consider a GTX 660 Ti.
As for cooler, I only have experience with the Noctua nh-d14 and am happy with it.