If I were to go solid state, I'd go with Pass Labs. Incredible stuff. I might pick up a Pass Labs preamp to go with the Orion+ setup. Yeah, it goes against most of my leanings, but Dr. Linkwitz recommends solid state for the setup and I trust his judgment.
As for tubes, DIY is really the ticket to the highest end. There are a few manufacturers that lavish on power supplies and parts, but the finest rigs I've seen are built with ridiculous levels of parts, cases and over the top power supplies. What some builders make would cost tens of thousands if offered commercially. Look at what Frank Cooter does. He's one of a few who build to that level with headphones, but there are many more who build that quality of gear in the speaker world. The nicething about tubes is that they're more accessible on the amateur level. You can't build a CD transport from scratch (though I'm sure someone has) but you can string together absurd levels of transformers, chokes, tubes, etc. at home and build something of far higher quality than anything offered commercially.