I owned a pair of B&W805n's also. A few months ago I was looking to upgrade. Listened to about a dozen different manufacturers. Ended up with B&W805N Signitures. More detail, better mids, more "rightness" to the music. They are a big improvement over the "stock" 805's; worth a listen.
Good Luck.
Good Luck.