Yamaha RX-A1020 for 2 channel music or 2 channel integrated (Outlaw) or power amp + preamp (Emotiva)

I've been thinking about upgrading my desktop/testing amp from a Sony DH130 to something more robust. Something in the 110+ watts at 8 ohm and is 4 ohm stable.

I have a Yamaha RX-A1020 that has been in storage because it has HDMI handshake issues, it was high end 7.1 a few years ago and bench-marked at ~113w x 2 @8 ohm and 146w x 2 @4 ohm. So power requirements are met but at the low side of the wish list.

Upside is I get room correction and sub out with bass control which is not a 100% need to have, but sure is nice.

I've been looking at the new Outlaw Audio R2160, which gives me the same power output, sub out with some bass control, but no room correction. However being dedicated 2 channel, it's smaller (which is nice) and I'm going to assume a bit better built.

The other option is Emotiva combo of the A-300 and PT-100. With this I'd get more significantly more power (150 @8, 300 @4), about the same size as the Yamaha. And while it has a sub out, it's full range and has no real bass control, meaning I'd have to add some other processor (miniDSP?) in the future if I wanted similar levels of control.

What do you guys think?