Time to replace my B&O for wi-fi hi-fi?

My current home hi-fi set-up is a Bang & Olufsen BeoSound 9000 with a pair
of BeoLab 8000 speakers. But since I bought an iPod six months ago, the B&O
rarely gets used, other than as an amp for the iPod.

I'm considering replacing the B&O set-up with something more suited to my
requirements. My main PC is in another room, and I'm considering Wi-Fi Hi-Fi
so that I can listen to more of my music in more rooms without any wires.
I'd also like to replace my old TV with something more up-to-date. I have a
few DVDs and a basic player, but TV and DVDs aren't my main requirement;
it's music. I read about BeoCentre 2 in Stuff magazine (Jan 2004), but
there's no info about it on their website. B&O are also slow to roll-out
wi-fi kit.

I've got about £2k to spend, plus whatever I could get for the B&O (cost
c.£5k).

Any ideas anyone? Thanks, Neil.