B&W 804D vs 803S

I currently have a pair of stand mounted B&W N805 speakers. While they sound great, I'm looking to upgrade to something with a bit more depth. I've tried pairing my N805's with a sub; however, I've never managed to get it quite right. That said, I have an opportunity to purchase a pair of brand new 803S's. However, I'm also looking at the new 804D's. I would say about 90% of listening is TV or movies and the other 10% on music. Right now, my setup is in the den of my house. 10 foot ceilings, open floorplan that opens to the kitchen and formal dining. Any advice would be greatly appreciated.
Stringreen --- I've looked at others, but I have to keep the wife happy with the aesthetics of the system. Since I have a matching center speaker and B&W in-ceilings for the surrounds (while same brand, probably has very little impact), I'm not looking to have different cosmetic looks. At the moment, I don't want to put out the cash required to upgrade my left, right, AND center. If you have suggestions for replacing all 3 front speakers, while keeping the same sound quality within, while coming in at the same budget of my current upgrade suggestions, please feel free to give your input. Thanks.
Without question, the Diamond version 804 is a better choice over the older 803s. The Diamond tweeter has a much smoother response and faster transient speed over the aluminum tweeters. This all translates (IMO) to a more realistic presentation right down into the midrange.
Is this a local dealer? If it is you should be able to get some kind of home audition. If this will not work out, take your speakers to the dealer for a compare, it'll be worth it in the end.
No, I'm not a dealer. Just a audiophile who owns B&W and has some experience with the line and a opinion. Yes it would be wise to take your speakers to a dealer and determine for yourself.
Mr_m, my comments were not directed to you; I was asking the original poster if he was working with a local dealer.