Nick, bought a Saleae logic 16 a year ago on your recommendation.
I very much like the new beta software that has been released for it.
Got a DSO for analog stuff as this Saleae version has limitations you alluded to.
Not sure the analog venture is a good one.