I agree with Shakedown, and would also want you to think about accompanying electronics. Better speakers are likely to push you to better electronics too...so you'll end up spending more there too.
My experience: I had B&W CM4 with Rotel RB1080 and sounded good to me. Replaced the CM4 with 804S and after a while started hating it. 804S were much more revealing, letting me appreciate the weaknesses of the amp. Ended up with a McIntosh MC275. Great combination, but much more expensive too! Then the preamp had to go...Lamm LL2 came in...you get the picture!
Also, larger B&Ws are known for "opening up" with very large amps. Very large + very good quality = very expensive, generally. Take it into consideration if you opt for an 803D or 802.
I'm by no means trying to disuade you from going down the better speaker option. I did take that route, but you should know the probable side effects!
My two cents.