If you like horns there is no going back as the dynamics are addictive. Sonus Faber would be super boring unless you are into “audiophile” music… I am not. But they would be balanced. I heard the Olympica III and Cornwall Vi back to back at my dealer. The Sonus Faber is refined typical audiophile stuff (good not amazing) and the Cornwall is brash and hard in comparison but has much more lifelike dynamics and snap.
you can get a pair of JBL 590s for $1000 right now they are better in every way to your current speaker. If you hate the looks the 698 is about $1700. Both can be bought from places with return policy (60 day trial).
the Cornwall is the obvious choice if you like Klispch (no hate I own some as well) It is not too bad and will fix your issues with the heresy which IMO is a dumpster fire.
I think JBLs are much more refined and with less resonances (wiggles in the response) than the equivalent Klispch but they are more money. Cornwall IV (demoed) vs JBL 4367 (I own) and I will take the JBL every time as it does all things better.
There are a couple of pairs of JBL 4349 in your price range on audio mart. There is also a pair of 4367 on here right now for $8500. Cry once and own a speaker that is as good as they come.