MA6900 or C41 and MC300

I currently have the Yamaha MX2000 Amp and CX2000 Yamaha Pre. I am considering replacing them with either a MA6900 or C41 & MC300.
Both the MA6900 and the combo of MC300 and C41 are available, used. Would these be an upgrade in what I have now? At least 10 years newer... Nothing special yet for speakers, but they are RX8s.