Did you ever settle on anything? How are the subs. Looking at upgrading to a pair of S/510’s. I’m in Portland. Not sure if you’re still headed here to visit dealers. There aren’t a ton but I would suggest Pearl Audio and Stereotypes. Echo Hifi is great, my favorite, but most of their inventory is second hand so just make sure they have something you want to hear. Otherwise I think they’re a Kef dealer. Sometimes they have some really great items to check out.
Regarding speakers, I would check out Salk and Cube. With your budget you would have a few options with Salk. I had a pair of Song3’s and used Primaluna and it sounded fantastic. You could move up the line to SS9.5’s and be blown away. I currently have Cube Nenuphar Mini’s also being driven by a Primaluna Evo300 amp. Best sound I’ve ever had. The speakers love tubes and are so natural and detailed it’s eerie sometimes. Cool thing is the Cubes can also run with very low powered tube amps too. I have an Oliver Sayes 45 tube amp that’s like 1.5 wpc and it sounds amazing too. There’s no dealer in Portland but I think the dealer is in Chicago; Refined Audio.