How much are you looking to spend? I have owned klipsch and B&W in the past. I feel that klipsch's weak point is their vocals and I feel that B&W strong point is there vocals. I really like the 803s and think it would fit your bill. I feel that in the price range of the 802D there are better speakers (thiel 3.7, Martin Logan spire, Wilson Sophia, etc). But a used pair of 803s will bring a lot of the "B&W sound" with a much smaller price tag.
One thing is to keep in mind what you are use too. The are RF-7s are some what bright and forward. The ZUs might just be too different... But I think B&Ws will out class the Klipsch on almost all areas.
Also keep in mind that a used pair of Martin logan spire are under 5 grand and I think they are a big step up from the Vantage. I had both the spire and 802d in the same room for a demo. The 802d imaged much better but was also more "colored" though the midrange ( and need moster amps). the bass was faster and more controled on the spire. The highs were both top notch!
One thing is to keep in mind what you are use too. The are RF-7s are some what bright and forward. The ZUs might just be too different... But I think B&Ws will out class the Klipsch on almost all areas.
Also keep in mind that a used pair of Martin logan spire are under 5 grand and I think they are a big step up from the Vantage. I had both the spire and 802d in the same room for a demo. The 802d imaged much better but was also more "colored" though the midrange ( and need moster amps). the bass was faster and more controled on the spire. The highs were both top notch!