I love my 1104z, but even with the protocol analysis it's hardly an MSO. The analysis is all in software, so there's lots to go wrong: it's pretty slow, it can be more intolerant of signal issues than if it were properly digital input, memory depth is substantially worse than a proper logic analyzer (much less a PC analyzer with effectively infinite memory...) And if you're playing by the book and paying for the analysis features, they're also another $150 or something over the base price of the scope. Definitely worth the price if you need them, but it's much more for the use case of primarily analog need, with light duty digital needs rather than the other way around.
Here's the thing on price: The 1104D is about the same price mostly because the 1104Z is much newer and represents an aggressive increase in value. You'll notice that the 1074z isn't substantially more expensive than the much older 1104, despite being wildly better. It's mostly because they're not dropping the bottom out of the price on the older series, they're just moving sales over to the newer stuff.
Anyway, for what you seem to truly need (a couple okay analog channels with a bunch more good digital channels on top), what fits the bill perfectly (I think) is the new Saleae Pro series that's available for preorder. I know you'd rather have an integrated device, but the fact is that in test equipment sorts of volumes, an applications processor, screen, housing, and UI cost a couple hundred bucks, so it doesn't make sense to spend, say, $300 or $400 on those things tacked on to a front end that's only $100 or $200. Rigol basically does that, but it's why you're not going to find even the cheapest device to fit your needs for less than $6-700.
On the other hand, the pro series has, at one price point, 8 channels, all selectable analog or digital, for $200. The digital channels are great and plenty fast enough for anything you might need that isn't a high speed serial bus (USB, SATA), and the analog sampling rate is basically just-good-enough (you'll see what's going on, probably enough to get the job done).