Interesting question. I have owned a number of Sonus Faber speakers… for natural sound you will not find better. Perfect for jazz, classical, rock, world… well most as recorded. They will sound like intended.
I think you just need a couple of subwoofers or a swarm… B&W are good for rock and the more bass heavy genera… but then you will loose some of the other genera you like. So I think you just need subs.
I chased a specific genera for a decade or more… electronic. I got the electronic to sound better… but all other genera sounded worse. I finally started listening to real acoustic music live… the symphony every month. It drew me to Sonus Faber… and all the genera sounded the better and better. So, be a bit careful on optimizing one kind of music. You can see where I ended up in systems under my user ID. I can assure you I am captivated each time I listen to it, regardless of the genera.