Hi there! I'd love to try and help you out with some recommendations. Before we get into that though, we need a bit more info.
As already mentioned, a budget would be very helpful. I'd also like to get a better idea of the sort of sound quality you're after.
As an editor, I'm guessing most of your work is more concerned about timing, sync issues, that sort of thing. Maybe you do some mixing as well? But do you also do mastering? Reason I ask is because most editors and mixers are much more used to very direct, linear sound. The mastering crew is typically more accustomed to a greater amount of room reflections and diffusion.
So I'm just making an assumption here, but I'm guessing your ears will be more greatly pleased by speakers that have more narrow dispersion, and have more of that direct, linear sound that I'm guessing you're more used to in your work. You also have quite a narrow room, so more narrow dispersion will limit room effects and reflections, which I'm also guessing will be closer to what you're used to, and therefore sound more "correct" and pleasing to your ears
If the stuff you've said you've heard about Polk's higher end LSi speakers being "better" than Yamaha's Sauvo speakers came from guys who are in the same line of work as you, that would all line up with my assumptions
The Polk LSi speakers are quite "beam-y", which is to say, they have quite narrow dispersion. Many people criticize them for this because they remove the room's ambience from the sound. But professional mixers tend to prefer that, because it's closer to what they hear in a studio with near field speakers and well damped walls.
I think what might really float your boat though would be electrostatic speakers. Martin Logan, of course, being the obvious "go to" brand for that type of speaker. With electrostats, you'll get the highly directional, exceptionally clear and direct sound that I'm almost sure will appeal to you, but you also get the dipole output from the back of the speakers, which does two things: it eliminates the sidewall reflection entirely by creating a null at the side of the speaker, and it casts sound backwards, which brings the room's ambience back into the equation, but with enough delay that it doesn't smear any of the detail. It merely gives you a sense of space that is lacking with headphones or near field monitors. Most guys don't necessarily want to bring the studio environment home with them. They want the larger, more open sound that is expected with a big screen TV and a much greater listening distance. But they don't want to give up the direct sound, clarity, detail, and linear accuracy they're used to at work! Electrostatic speakers are, IMO, the best way to do all of that.
They LOVE lots of amplifier power though. And can really dip low in impedance sometimes. So I'd highly recommend you get some nice, beefy, low impedance-capable amplification to go with them. Thankfully, Yamaha receivers make for excellent pre-amp/processors! (The ones that have full pre-outs, anyway
) So using a Yamaha receiver is a great choice here. I'd simply recommend adding separate amplification for at least the front 3 speakers. So I wouldn't focus on getting the highest end Yamaha receiver. I'd focus on getting one with all the features, inputs, and decoding that you want, and then just make sure it has pre-outs so that you can add that separate amplification!
Amps are all over the place in terms of prices. I'd just go with something solid, like an ATI AT2003 for the front 3 speakers, and then let the Yamaha receiver power the surrounds.
Any mixers I know tend to hate bloated bass. I'd recommend a really tight pair of subwoofers to you. Something like the Rythmik F15 or F15HP, or the SVSound SB13-Ultra if you can afford them.
Hope that's of some help!