I listen to both, music performance is a priority for me hence the mono-blocks (my 603's are difficult to drive and the 5300 could not cope as well as I would like for bass), the 5300 IMO does both very well, With respect to the Yamahas my last amp was a DSP A5, obviously their amps have moved on since then but the Marantz was a massive step up for music and movies (even before I bought the mono-blocks), even my wife commented on the difference. If it was up to me I would go for the 7300 they are a bargain now, I think RS had them for £400.
Setting up is a doodle on the Marantz, you assign what mode you want to what digital input or leave it as analogue, set speaker size, speaker distance, and gain (just do this by ear if you do not have a meter) and that is about it, it remembers which surround format you use for each input when you switch over.