I'm getting ready to upgrade from a Bitscope BS10U to my first "real" dedicated scope. I've watched all of Dave's videos on the DS1054Z and with it's feature set, popularity, and "upgradeability" it seem like my best choice. One feature that a non-upgraded DS1054Z for sure doesn't have is waveform generation. The DS1074Z does have waveform generation and seems to share the exact same hardware as the DS1054Z, but it is unclear to me if there is an upgrade path that would enable waveform generation on the DS1054Z.