I have used a Meridian preamp with a separate main amp and analog speakers for quite some time because I like to be flexible and be able to switch out speakers and main amp for other models, currently I am using a Mark and Levinson no29 with Thiel CS 2.4 speakers which gives me great detail and staging.

I can understand why you do not like the B&W sound with Mcintosh, I always found B&W rather "dark" sounding and have tubes powering them might make that worse.

I would audition some different main amps with different types of speakers to see what might be a good replacement.

861v4/ID40, G98, UHD722, Mark and Levinson No. 29, 2 * Linn LK85, Linn LP12, Musical Fidelity X-LPS v3, Empire Vandenhul MC1000, NVidia shield, PS4, Thiel CS2.4, Thiel 1.6 rear, Audio physic Celcius centre, Rel Quake Sub