How different between B&W 804s & B&W 805s????


I'm currently using a pair 805s and having a good chance upgrading to B&W 804s. I know that floorstanding speakers always better than the bookshelf but how different??? I'm also saving some money 4 my new amp(my target is Mcintosh 6900 or 2275), so, shoud i upgrade this speakers or saving that money for my future amp????
ngocdj
Related to the question discussed here.. would there be some guidance on what would be the good components to match with either 803S or 804S. I am not certain what to buy - I have zeroed on the following two options -

1. Classe System - Integrated Amp (CAP 2100), CD Player (CDP102)

2. Linn System - Pre Amp (Akurate Kontrol), Amp (Akurate 2200), CD Player (Akuate CD)

Please advise if I am completely missing the picture here by not looking at best in class components to powere and source these speakers or are the above options good. Also, if you would advise one more than the other?

Thanks
I previously owned the 804S before upgrading to the 803D. Unfortunately I haven't directly compared them to the 805S, so cannot comment on 804S vs 805S.
But I do want to comment on the 804S and 803D given some of the posts above.
The 804S is a very open (definitely not congested or boxy) high definition loudspeaker that remains composed at surprisingly high volumes. While it performed well on modest Marantz gear (SR9300, PS17SA, SM17SA), the overall tonal balance was a light in my large open plan lounge.
The 803D is all round improvement (midrange a bit more laid back than the 804S), but much better bass and tonal balance. And contrary to a post above, the driver integration is superb and noticeably better than the 804S which was not bad. Surprisingly the 803D is not as demanding on amplification as the 804S, but does responds to every improvement up the chain.
I did try the 804S in a small room (3m x 3.5m) where the bass tonal balance was good, if not earth moving.
My suggestion is to compare the 804S to 803S to 805S+subwoofer with your preferred amplification before making a decision.
BTW, the Marantz PM14Mk2 is a great amp and will drive the 804S or 803S/D fine.
Thanks.. in the meantime I had a chance to compare 803s and 804s and I am sold out on 803S. The question remains on compatible electronics with the speakers that supply good power - I am going to try Marantz and Macintosh equipment over the weekend based on the suggestion. Hopefully I move closer to making a decision.

Cheers!
Vikaschhariya: I run a pair of 803S' with a macintosh 402. I compared a number of amps (however not any Marantz models) and nothing came close to the mac for my tastes. However, I herard little, if any, difference between the 252, the 7000 integrated, and the 402. In pushing the 803s' to their limit I could get the power guard lite to flicker on the 7000 and 252 - which did not happen on the 402. Speakers are a matter of taste- I like the B&W sound and compared the 805, 804, 803S&D, and 802 - and from my perspective the 805 and the 803S were the best of the lot. The main difference I noticed between the 803S and the 804S was the 803S sounded better at low spl levels than the 804S. While his goes against the conventional hype - I did not like the sound of the models with the diamond tweeters; if B&W currently had their metal tweeter in the 802 model I would have went that route. Good choice on your speakers - let us know what amp you choose.