I’ve travelled a similar path from “precision and accuracy” with Focal Kanta 3’s and Rockport Atria ii’s with D’Agostino solid state back to Tannoy Kensingtons with Pathos Heritage MKIi hybrid and a more “musical” to me presentation which is where my preferences lie now. I’d suggest giving the Revel and Sonus Farber good line listens to see which sound character appeals to you and then explore different brands with the type of presentation you are seeking.
Serious plus 1 for Joseph Audio. With Doshi tubes they were the best room at last Chicago IMHO. TOL is $30k though. My room is also 22”x15”. With one REL S/81 and the Pathos it is a fully enveloping experience. Not familiar with your electronics, but that synergy is key of course.