Yes, I watched the lab setup video. I've decided I'm going to get the rigol DS1054Z and the siglent SDG1025. I considered getting the DS1074Z-S plus, but the mso feature isn't that much of an upgrade and I can get another logic analyzer later. Having a seperate function generator will be more useful, and there will be less fiddling. From what I've read, it seems better than the Rigol DG1022. If the Siglent SDS1102X was a four channel I would probably go with that. The UI is a little better, and the scope is generally more responsive, but the four channels are worth having. I have been keeping an eye out for an analogue scope, and will certainly pick one up when I find a deal. I have used CROs before, and I try to stay away from the auto setup button as is. Thanks for the input everyone! I'll be making my purchase tomorrow.