All-In-One or Separates for iPod & DAB/Internet Radio?

Hi,

I'm moving to a new place shortly, and looking for a new system for the lounge. I only ever play digital music nowadays, currently from my MacBook to a Cambridge Audio DAC and a Rotel Amp powering some Mission M52 speakers. That system is going to my office, hence the need for something new.

I have a Revo Blok in the kitchen which I really like (Although not the nasty remote), and in the past I demo'ed and almost bought a valve based system in John Lewis. I like the sound of both of these, so something similar would be good.

My budget is around £1.5k and I've plenty of space, so separates could also be a possibility.

Any suggestions for things I should demo?