Thanks
@Golfx for that info about Class D amps.
In terms of using pre-outs, I rather avoid that. I will most likely just keep the 5.1 setup, but having a couple more amps to move to either 5.1.2, 5.1.4, or 7.1 would be great.
I really want an all-in-one unit. One that is free of HDMI bugs. Having to unplug things and/or power off the receiver is not going to fly. I don't even have any 4K sources yet (but about to), so I can't imagine how many more issues will crop up with the current receiver.