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.
no_slouch
No Slouch,since I don't know what is the watts/current drive of your Jadis845SE is it's hard to make a recommendation that would match up with your electronics. But with the music you listen to you might love the sound of Magnapan 3.6s that are a great speaker at almost a bargain price($3,800.00). You have to spend much more to get a speaker that out preforms it,in my opinion. I do see they come for sale here on the GON so new or used they might be available to you in china. Hope this helps
You may want to consider Coincident's Total Victory for your application. They are an easy load for tubes. And they would be able to fill a listenting room your size with as little as 15 watts.
Silverline Audio Sonata MK3 great sounding speakers retail for $7,200 a pair and can be drvien with 10 watts SET amp.
Thanks for the responses so far. My amps are 20 watts per monoblock. My living room is actually about 17 x 35 feet, but through sofa placements I only use about half the room, or 17 x 20 feet or so.

Teajay, my preamp/amp combination retails for about 35K (luckily i got used for much less than half), would the Magnepans be a good match just from a budgetary point of view? (10:1 value ratio of amplification to speakers)