All good ideas. Here is a third twist:
Music Hall Trio, Quad 21L-2 speakers (about $2300 new)
The Music Hall Trio provides a quality CD player, integrated amp and AM/FM tuner in one box. It sounds nearly as good as the Music Hall separates suggested above or the snazzier looking and more expensive Arcam Solo, and if you have space or display problems, this solution may appease the Misses. For that matter the Arcam Solo might fit the bill as well, but for about $1600.
The Quad 21L-2's are very nice speakers and little bit cheaper than the Epos. The Quad 22L's are closer to the Epos M16's in configuration and exactly the same price. If you want the extra driver, I would go with the Epos since their execution is perhaps a bit more neutral than the Quad 22L.