Hi,
Couple of comments,
Can you stretch to a Q6600, will be easier now than later.
Also the PSU, just bought a new Corsair 620w myself after much headbanging over 520-620w
A good psu will last many years, I've only just replaced my Enermax 465 after around 5 years and about 6 different builds.
Better to have a little extra in hand as graphic cards are needing ever more power, coupled with Quad core + 8 core next year?
Regards
AD