I did end up going with Sonos and it wasn’t cheap. I wanted in wall speakers so I had to go with a powered amp for each zone. At $500/each, I’m at $2k just in amps. Pricey, but it does what I want, at least until the Echo came into our lives because telling your speaker to play a song while your hands are busy cooking dinner is amazing.
I’m waiting for the promised Sonos/Echo integration to be finalized. It will then be the perfect home audio solution.