Help with $1000 build for Photoshop CS5

Hi -

I'm planning to upgrade my DSLR (currently 6 mp), computer (Pentium 4, 2GB RAM), and software (Photoshop 6.0) in one fell swoop. I've already decided on the DSLR (16mp) and software (CS5), and I need help on the computer part. I've set a hard limit of $1000 (before taxes/shipping). I'd prefer to use a pc builder llike avadirect.com, but I'd be will to try building it myself.

In terms of usage, I plan to primarily work with RAW files, typically with a few adjustment layers. In the future, I'd like to play around with 3~4 image stitched panoramas. And occasionally I'll be working on 400 MB large format scans.

Here's what I have in mind:

Case : Antec Three Hundred Mid-Tower ATX
CPU : Intel i5-2500
MB : ASUS H67 mATX
Memory : 8GB DDR3 1333 MHz (2 x 4GB)
CPU : Thermaltake TR2 RX 650W
Optical drive : Bluray/DVD combo drive
Hard drive : minimum 500 GB 7200rpm SATA
OS : Windows 7 Home premium 64bit

How does this look? I'm open for suggestions on anything.

Some things I've read about but have no idea how to decide:

• i5 vs i7 CPU

• H67 vs P67 motherboard (i.e. should I overclock?)

• built in GPU or dedicated video card (i.e. do I need nVidia/CUDA?)

Thanks!