upgrade advice

I currently have a Rotel RC-1090 pre, RB-1092 amp, RCC-1055 changer (not used much), Rega P7 w/DV20XH, B&W N804 & ASW800 sub. Although the Rotel amp/pre is a good combo I have the need/fix to upgrade. I know Classe equip. works well with B&W. Integrated would be OK but I would require a pre out for the sub. I am open to all suggestions. Budget is $6000. My listening room is 20'W X 25'L X 12'H.