I kind of took Sir Prize's and ran with it re-adding aspects from mine as well as refining it over all, In Dollars your budget is basically 1800$, but i went slighly over-board and is 150$ over that, but you will not be disappointed.
http://pcpartpicker.com/p/30Dup
Motherboard: Is still very capable at overclocking, especially the Revision 4.0.
CPU Cooler: It is a closed Water loop that is Actually really good at over clocking.
Wire-less: like he said, but i personally will be moving my rig to LAN parties so i will be putting a LAN Ethernet and a Wire-less.
Case: I Decided to keep his case because there was no real particular reason I had mine besides the fact that I own it, it is good, it gets the the job done and it's cheap.
PSU: For the price, I thought his choice was Perfect.
SSD (yes, out of order :P) : This SSD is MADE by Samsung, has a Good coltroller and Has a boost Of up to Gigabyte R/W speeds, It is a solid SSD.
CPU: this CPU can be very overclocked, has 8 cores over The i5's 4 core. And here is a vid by Logan:
http://www.youtube.com/watch?v=eu8Sekdb-IE
(It is better for multithreading and multi tasking, so over all more productivity)
Over all, I think that combining Sir Prize's Build and Mine was good, I think you should go with this one.