Need help to build new computer

I want to change computer before year 2009 starts. Finally my old HP Compaq Presario SR5610f has now been poor. I have with me a 22'' screen, a keyboard and a mouse. And my budget is approximately Rs. 15000 (may add atmost 5000 bugs more if required). I use to play very few games. I tend to enjoy a lot of musics and movies on my computer.

So I need a large storage capacity and a PC running at very good speed especially when it comes to transfer files within the computer. I even do a little of photo editing.

So can you suggest me good rig on which I would like to do everything as I mentioned over here.

Samsung Spinpoint F1 DT HD502IJ 500 GB with 16 MB buffer
Intel Core 2 Quad Q9400
Asus P5Q Deluxe
Nvidia Geforce 8500 GT

As you can see, I have made a list. I just want your views on it. Also if any suggestions.

I find your specs most interesting. The hdd seems to be ok, you could go for 320GB also but as you said you want want larger capacity then that is absolutely fine. However you can also go for Seagate Barracuda 7200.9 - 500 GB. It is also good. Otherwise everything is very good.

Go for Core 2 Extreme QX6700 processor. It is best for photo editing purposes. And also Ati Radeon X1800XT may result you in a better way.