Thanks for all the inputs, folks. I decided to pull the trigger on the CSP2+ and Taboo, getting the headphone output on the Taboo as well. Now to be patient and wait

I have no doubt I'll be totally happy with the purchases, and I think this combo will give me a bit more flexibility with tube rolling over the Mini Torii, so that's the way I went.