Have you thought of listening to the SuperUniti? as that is quite a large step up in overall sound quality compared to the Uniti2, I would have thought that the Uniti2 and Nait 5i / CD5i would have sounded similar but as good as the Uniti2 is you are genearly always better off with seperates if sound quality is more important than keeping everything tidy with the one box solution, also very shortly the CD5si will be available which will sound better than the CD5i.
Alot of customers I have dealt with over the last year or so come in to listen to the Uniti, or uniti2 as it is now, convinced they need a cd player, but after hearing the SuperUniti most go for that with the view of adding a seperate CD player later or using an exisiting one, but once everything is ripped to a NAS they realise they don't actually need a cd palyer anymore.
Decisions, Decisions.