There's no practical difference between the two when you're overclocking them.I'm slightly irritated at myself for going with the i5 now instead of the i7
I definitely recommend getting an aftermarket cooler. Getting a higher OC on your CPU is pretty much the only thing that will get you better performance (at a sensible price) currently.