Home theater / Music system

Hello all. I dabble in audio but do not claim to be an expert. Here's the scenario:

I currently have a Yamaha surround receiver that I want to get rid of. It's always been lousy for music anyway.

I have a pair of Klipsch Heresy II's for the front channel, a Phase Tech center channel speaker, and a pair of Phase Tech rear speakers. No sub currently.

I just bought a McIntosh MC2125 to power the Klipsch's. It works, but could use a little TLC. Now I'm looking for a AV receiver that has pre-outs. I found the Onkyo TX-RZ730, which has pre-outs for just about everything. Also lets "zone 2" listen to a different source, which would make my wife happy.

Thoughts? Good choice, bad choice?