B&W 805D alternatives

I've got the upgrade bug and want to get a new pair of speakers. I currently have a pair of 805D's with the following: McIntosh MC275, VTL 2.5 preamp, Moon .5 CD player, Concept Turntable with Moon phono stage, all cables and interconnects are Nordost. I have the opportunity to home audition a pair of Sonus-Faber Olympica I.
I would like some suggestions on what would be a good upgrade. I would sell my speakers and put $2000 towards the new pair.