If it were me, I'd go with Moth Cicada speakers...their site is here...
http://www.mothaudio.com/
(about 700$)
Or, you could go with norh 6.1's which run from 600-900$
As for the amp, I'd either use a bottlehead foreplay connected to paramours (about 500$ total...the best you can get for the price IMO, but you have to be able to use a soldering iron)
If you don't want to build your own amps, you could go with ASL wave 8's, and a twin head as your preamp (muahahaha...use your main setup as an excuse to get a kickass headphone amp/preamp) this amp combo would cost about 1450$...but you would have to spend a bit less on your speakers...hell, if you wanted to spend less, you could get any good tube amp with a headphone jack...melos sha-1, microzotl...almost anything. I know the melos will make the best preamp though. I have not heard the twin head myself, but I bet it sounds pretty sweet.
Alternatively, you could go with an integrated amplifier (much more convient if you don't have space) ...there are many great integrateds out there...but I think you would like the ones of a tube flavour...here are my recommendations:
ASL AQ1001 DT (1100$)
McIntosh MA1500 (about 400 used) good deal!
I have not heard the jolida that you mentioned, but it looks like a good deal, go for it. Whatever you end up with in the end, I'll be envious, just because mine will probabally never be up to that level. (I spend waaaay too much on sealed vinyl...it's a bad habit)