What should I choose??

OP,

If your mind set on B&W and Bryson, I would suggest upgrading your speakers first, the newer D3 series is completely redesigned and improved. Pairing it with your old Bryson amp will give you a pretty good idea on how they sound together. If you decided to look into another brand of amps, I recommend reborn Classe Delta amps.

https://www.classeaudio.com

Another vote for room treatment. How about your cables?

PS: I used to own B&W 800D2’s....please stay away from McIntosh.

You've heard the 2 new products together already right? Because you like the synergy of the 15 year old components you're taking a leap of faith you'll  like the new combo as well. While i've never been a B&W guy I vote speakers first .

I do remember listening to a classe setup with the 802s. It was a really good match. 

Never been a fan of B&W's.  Where's the bass.  However, add a pair of REL subwoofers helps to fill in the bass.  I know I keep saying this, but I think the SALK speakers are the best I have heard under $60,000.  Jim Salk is incredibly knowledgeable as well as nice.  Tell him Larry Edwards from Denver sent you.  You will love this guy.  His cabinet build is incredible and he uses the best drivers money will buy.

How are your room acoustics? 
“Please, I don't need to be told to buy amps or speakers other then the ones I am asking about as I am a big fan of my system.”

Since you like what you have, I would recommend going over your room acoustics one more time, listen and then proceed from there.  By evaluating your acoustics in the room to ensure that you are extracting all of what your total system has to offer, you may be surprised at the improvement in sound. My room is custom built but to my exact specs for sound abatement and acoustical dampening. The best my system has ever sounded and the sound is just amazing. BTW, had a pair of 4BSSTs years ago and they drove the N800s very well but went to tube amplification later on.