I'll second Judit's recommendation. The speakers appear to be the weakest link. Also, get a phono preamp and get that turntable going again. LP's will sound 'warmer' than digital. You may want to trade the B&O for a Rega 3 or VPI JR. As for speakers, go listen to some Dynaudio, Sonus Faber, Vienna Acoustic, Soliloquay, or Silverline speakers. Then you'll realize it's your speakers.
Happy hunting,
John