Onix SP3 or Jolida 102b with Von Schweikert VR1's

Here's the deal. I mostly listen with headphones and a dedicated tube headphone amp, so the speaker system is really my "second system." I have a pair of Von Schweikert VR1's, because they're small and look good (WAF!). Amp is a NAD C320BEE, which is great for its flexibility (I have a TT, 5-disc carousel and audio CD recorder as well as DAC & transport that I se with headphone amp), but the sound is kind of lifeless, despite the good reputation of both the speakers and amp.

I'd like to replace the NAD with a tube amp, since I know what tubes can do on the headphones. I haven't heard either the Onix SP3 or the Jolida 102b, but from what I've read, the Onix is a little beefier and the Jolida more ethereal. Anyone heard them both? Any thoughts on compatibility with the VS1's would be appreciated.

(I'm also open to replacing the speakers too, but I'm pretty sure I want tubes anyway, so probably replace the amp first.) Thanks.
Take a look at the Primaluna PL1 or PL2. If you search systems i think there are a few 'goners using this combo.