System Upgrade advice required.

Hi Folks

Need some advice. I am thinking of upgrading my PC to the following, by the time I finalize and gets funds ready I think it will be atlease a month from now:

1. CPU - Intel Q6600 (I have heard about Q9600, but dont know when its coming and how much it will cost. Cant keep waiting forever)
2. MotherBoard - 3 choices - MSI P35 platinum / GigaByte P35 DSQ6 / ASUS P35K E
3. RAM - Crosair TWIN2X2048-6400 (2GB kit)
4. Power Supply - 3 choices - Corsair HX620 / Corsair TX650 / Antec True Power Trio TP3 650 (The cheapest of the 3)
5. Graphics - Leadtek 8800 GT
6. Cooling Solution - Corsair Nautilus 500 - my first venture into water cooling
7. HDD - WD Raptor 75G + Seagate 500GB
8. Monitor - 22" Dell UltraSharpTM 2208WFP

EDIT: 9. Case - Antec P900 or Antec P182

I am not a keen overclocker, but if something is available by default which does not require a lot of tinkering around wont mind trying it. I need your help in deciding on a motherboard, while I understand performance wise all 3 are at par.. what about build quality.. The reson for asking is that i currently have a Intel board and its just 2 years and all the connectors at the back have rusted very badly.. so much so that one of the USB connectors is rendered useless. I dont want a repeat of that.

Any advice on the same or general comments on the config would be very appreciated