Generally, yes, separate units. I bought my MSO1074Z-S for field use, so for me it's really convenient to have it all in one small package. But for lab use, separate.
FWIW, apart from differences in functionality, the -S models have the sig gen outputs at the back, and accessing the functionality from an already cluttered menu is less than smooth.