So, I did a little talking with a local retailer, and basicaly got staff prices from the sales guy.
So, I now have a:
Intel Core 2 Quad Q6600
Intel P35 Dragontail m/b
Apacer DDR2 800mhz 4x1GB
Seagate 80gb
WesterDigital 320gb (they were out of seagates)
Gigabyte 800W power supply.
They, like most of the shops at the moment have sold out of the 8800GT.
That should be in on Thursday. 
I'm thinking I will also pick up a pair of 500gb drives, and a case with a couple of fans to fit it all into.
Current case only has 4 drive bays, I need at least 5.
Its also a bit bent, but I bought cheap because of that.
That will mean:
Vista on an 80gb SATA2 drive.
XP on a 40gb IDE drive (for LAN gaming).
320GB for general storage, movies, games, etc
2 x 500gb for photo storage ONLY. One as back up to the other.
1x 250gb Sata drive for, well, I sort of forgot I had it........
The m/b has an extranal SATA connector, so I might but the 250gb in a case, and use it for off site back up. Put my most important photos on it, with other documents etc, and keep it at work.