I would look at the following:
Rega Apollo CD (£598)
Naim Nait 5i Amp (£725)
Mordaunt-Short Mezzo 2 Speakers (£400)
Add cables and a decent tuner (either the Denon TU1500 or TU1800DAB depending on whether you want the DAB or not) with a pair of good quality speaker stands (Atacama Nexus or similar) and you'll have a cracking set-up which will easily show the door to the two all-ine-one systems and make future upgrades easier.
With your budget you might also want to look at the now end-of-line Roksan Kandy MkIII CD player and Amp, available for less than £1k now for the pair. Creek's Evolution series would also be worth a look - CD, Amp, and Tuner with a pair of Epos speakers would make a cracking system.
Audiophile?? NO! I'm a MUSICPHILE who happens to require the highest possible sound quality from my hi-fi.
Its ALL about the music.