What should I choose??

Hello, one issue is your amp is getting old. Most people in here knows that 20 years is the approximate life of an amp due to the caps. An option is new caps. Maybe even upgrading them to something better. Way cheaper and better sound. 
I agree about room treatment. It’s like owning a really nice sport car with cheep tires. It sounds like you have the means so start with the room treatment. 
After you have done those two things you can check out speakers. Maybe there is an option to upgrade the components of the speaker. New mids and diamond tweeter. 
This might add up to your current budget and improve the sound the most. 
Try upgrading to silver interconnects or speaker wire to get the detail you are craving with your old speakers and amp. Test first, it can get harsh with some systems. 
Last but not least. Test, test, test. 

I would save up and buy both at the same time.

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.