McIntosh MHT200 vs B&K AV508 Vs Separates?

Some time ago we moved and downsized our system. We currently have a B&K AV307 as the Receiver/Amp/Processor. Our L/R speakers are B&W Naut 805's/ center is B&W HTM2. Rears are ceiling mounted B&W's wit a Velodyne 8" subwoofer also in the system. Have a Krell 250cd also. We are in the process of upgrading and based on space and listening habits 75% movie and 25% 2 channel are probably better off with a receiver. Does anyone have any thoughts on a better system than the Mac or B&K separates. Would like to keep outlays around $6-$7K. Thanks in advance for any help.

John Butler