B&W's are typically better with ss amps. I'm surprised your having problems with "grit" with your system. While a tube pre doesn't typically inflect a tube sound as much as tube amp, and while you have a fine ss pre, if you want to add tubes, I suspect for total system synergy, you might be better off with a tube pre rather than a tube amp. A
c-j tube pre might be a good candidate.