If you are into tube gear, Deja Vu Audio is THE store to visit--they only sell tube amplification (except for trade-in gear). Much of their amps, linestages, phono stages, some DACs are either built in house or by their own exclusive builders. This is a place to explore, and the staff is so willing to let you just do that--no pressure for a sale, plenty of time given to explaining what their systems are all about.
But, I would not go their for a repair at this time. Unfortunately, one of the builders, and the principal repair person suddenly died last week. I don't think they can do a fast turnaround on repairs for a while. The plus side of using Deja Vu for repairs is that you can probably talk them into providing a loaner while the repairs are being made.
I would go to Bill Thalman myself, but, fast turnaround is not their forte. They get so much stuff in that it might take some time.