Pretty much finalised the part list below, but if there are any changes I should make do tell :)
Note that I'm keeping the two HDDs I already have and the wireless card. I don't see the need for an optical bay, I have my windows 7 install disc but I could burn the .iso to a pen drive if needed...