I have an idea that might interest you. If you’re looking for “more soundstage and clarity” you’ll get that in spades from the Scan-Speak B741 Speaker Kit by Peter Noerbaek (as in PBN speakers). I had these speakers in my system on demo built by Peter himself, and they were truly outstanding in terms of detail, neutrality, and a wide open 3D soundstage with tight and tuneful room-shaking bass. Also, I drove them to very loud levels with my 100Wpc stereo amp so there’s a good possibility your Yammy can do a respectable job. BTW, I’ve heard your AVR driving B&W804D3s and it sounded surprisingly amazing, so I don’t think keeping it for a while is such a bad thing. But I do agree replacing it eventually with a good integrated or separates will get you more, and the B741 will certainly scale up and reward you accordingly as its capabilities and limits are very high.
The bad news: The kit costs about $3500 from Madisound for the crossover and drivers. But, the crossover alone is “only” $1200, and Peter (being Peter) used Scan-Speak’s top Illuminator drivers in the kit, so if you chose still very good but less costly drivers it’d cost a lot less and probably still sound close to the full Monty kit. Anyway, probably a nutty idea, but since I got to hear the speakers and they offer so much of what you’re looking for I thought I’d throw it out there FWIW. Best of luck in your search.
The bad news: The kit costs about $3500 from Madisound for the crossover and drivers. But, the crossover alone is “only” $1200, and Peter (being Peter) used Scan-Speak’s top Illuminator drivers in the kit, so if you chose still very good but less costly drivers it’d cost a lot less and probably still sound close to the full Monty kit. Anyway, probably a nutty idea, but since I got to hear the speakers and they offer so much of what you’re looking for I thought I’d throw it out there FWIW. Best of luck in your search.