So I'm looking to rebuild the home theater system

For your budget you could almost get away with separates, even decent ones. Recent model marantz 8802a has dropped in price to just under 2k places are blowing them out to make way for he new 8805.  Anthem, lexicon, older krell, and outlaw 7 channel amps can be found for under 2k. So you can almost have it all at that budget.  The separate amp in most cases will be superior to the receiver but the setup is obviously more complex.