Better 2-channel music

My system consists of the Marantz SR7007, a pair of Emotiva XPA-1 mono blocks, Emotiva XPA-3 for center and surround, Rythmik 15HP sub, Oppo 103, Focal 1000 Be II series front and center, Infinity IL10 surround and back. I listen music from CD and different digital sources and movies from bluray DVD and Netflix, Amazon... My complaint is the Marantz doesn't deliver the quality of 2-channel audio as I expected. My plan is to upgrade either to Emotiva XMC-1 or Marantz AV8802. All suggestions and advices will be greatly appreciated.