best 5-20K speakers for high-end tube amp?

I have a Jadis JPS2 tube preamp and Jadis 845SE tube amp combination, and want to get a pair of speakers which really show off their sound. I currently have a pair of B&W804s, and I figure that seriously upgrading my speakers will give me a significant improvement in sound (these speakers are in a much lower budget range, and not ideal for tube amps I believe). What speakers would you recommend to really get the best out of my equipment? I heard the magic with my Jadis amp in the store with a pair of Wilson Puppys 5.1 in the store. My home system has decent sound, but not at all 'magical'. My currently listening environment is about 17 x 25 feet (9 foot ceiling), and I generally listen to jazz, pop, world (everything from indian classical to spanish flamenco to andean flute music, etc...), and vocal music of all kinds.

I figure the budget will be between US$5K and 20K somewhere, and I will try to buy used, but this will be difficult since I live in China.