Some time ago there were some posters suggesting that what they really wanted was a slightly upmarket version of the M-CR510 and 610 systems.
Ie a single unit that has all the functionality of these 'all in ones', networking, Streaming, Airplay etc but with an improved sound quality.
Can't help if you want a CD player, but if you do not, take a look at the NR1504.
All the functionality of the M-CR510 plus, if you are interested, TV switching too. Sure it's an A/V unit with 5 fairly lightweight power amplifiers but you can simply forget about them and use the 2.1 pre-outs.
Add a nice pair of active speakers, DM5s maybe, and you are good to go.
Even more 'traditional' users can just add a power amp and passive speakers to choice.