I would go separates, $1588 Emotiva UMC200 $600, XPA3 $629, UPA500 $359 I have the umc200 with an xpa5 and it is a lot of power, and should have NO trouble giving you the dynamic headroom you are looking for....
or this doesnt look like a bad deal $1800
PT-7030 Home Theater Preamp/Processor | Sherbourn Technologies I heard these recently for 10 minutes of Tron playing powering a 7 ch emotiva setup with dual subs, sounded just fine, but honestly for the money I would go with the above setup for 200 and change less, or better yet the umc 200 with an xpa5, and a upa2 for around $1800.... but any of them 3 options would be really nice, I LOVE my 200 and all my emo amps have been tanks...
If you don't like the emo stuff and don't want to go separates depending on your budget check out the Denon AVR-4520ci for around $1600, the marantz SR7007 {I believe that is 7 discrete 130w channels} for around $1300, Yamaha RX a1030 for around $1000, and then the Denon 3313ci for around $650, and the Pioneer 1222k for around $500.. I haven't been keeping up as good as I used to but that should be a good start, but honestly I would go separates if that Onkyo wasn't doing it for you {because that itself is a decent unit}...
Maybe start off getting that fixed and grabbing some amps, use its preouts, maybe it is just the lack of power not making you happy, grab an XPA3 or 5 to start and run the surrounds off the avr and your fronts off the amp.... If that still doesn't do it for you then start searching for a receiver...
Personally I would go umc200, xpa3, and upa500 that should be plenty of power.... if cost is less of an issue, and you listen to loud music and really want to get them focals screaming XPA2 on the front left and right an d an xpa5 power the surrounds and center, that would be a nice 1600 watt 7 channel system, and I bet you can get them 2 amps and a UMC200 for under $2000 shipped if you call emo up and make them a good offer, they will work with you...