Nice system. I used to own a pair of Cary 805s too. Can’t go wrong with Cary amps. But instead of the B&W speakers, I’d be inclined to put Devores with them, especially the new Gibbon X. Something to think about:
http://www.canuckaudiomart.com/details/649326123-devore-fidelity-gibbon-x/
http://www.canuckaudiomart.com/details/649326123-devore-fidelity-gibbon-x/