Can the OP give a budget.... To me that is the problem with B&W, its not until you get into the really high priced stuff until things start to sound good.
Personally I found the 804s to be very bloated on the low end and lacking in presence in the mids... high end was ok, but certainly could be better.
A good set of bookshelves with a sub for flexibility of placement can and will be a fantastic solution - the S2's .v2 are amazing in all aspects of sweet ribbon like highs that have great dispersion, soundstage and depth and blend extremely well with a good quality sub. More then adequate in a medium to large size room IMO.
I just bought a full line of Sigs to replace my studios... .v3 Sig s8's, .v2 C5 and S2's....
My dealer doesn't even carry the Sigs, studio's is his highest line, but he gave me a very nice price, and IMO they surpassed the 803D's in all the aspects listed above including a better looking cabinet, when we were doing auditions in his really nicely laid out room... He even commented on how much he loved them, though they were fantastic and he's a B&W fanboy as you can see.... His wife thought they were gorgeous