I suspect since the system sounds good with analog...your probably best served to change your digital to something like a Jolida 100 with level 1 mod.(Big bang for the buck player) It supposed to sound very analog like and smooth. Your system with the B&W 804's is quite a nice match otherwise and knowing the B&W sound is anything but harsh..and having previously owned a CAL Icon MkII I know its tends to be a bit forward(although not bad sounding) your best off upgrading the digital first IMO
Happy Listening :)--Ken
Happy Listening :)--Ken