I've just ordered the QNAP TS 109 with a 1TB Seagate drive and squeeze centre pre-installed and tested for the bargain price of £362.51 GBP from
here. I'll use this to hold all my media, rather than leaving the PC on all day. On paper it looks rather good and has rec'd a number of awards from websites I trust.
I'll probably get an external usb drive to back the QNAP onto every month or so and store it in the garage/at work/not in the house.
I'm looking at upgrading my network as well. I've been using powerline ethernet adapters and found them, well, really rather good. However, with the number of devices I want to connect to the network growing, I've decided to buy a couple of Netgear GS605 5-Port Gigabit switchs (£25 ish each) and upgrade the whole network to have gigabit capacity.
So, I'm spending my money to invest in the areas I believe home entertainment is going and I feel that the network/hardware infrastructure is something I need to get sorted early on. Wireless is OK......but you can't beat the speed, stability and security of a wired solution.