I'm about 3 years down the road from the place you are today. THe best thing i ever did was stop relying on CM, and brought it in house. I've gone Yamaha ( now have 2 Yv-100iis) and will be adding a third slightly newer machine.. I've also had chinese desktops and i'd just say avoid them, it will just result in pain. I'm using Vapour Phase and its great. I dont' have too much problem with electrolytics, ( we dont' use lots though ).. Tombstones are a matter of good solder paste application.. dont' underestimate solder paste application.. that is where 90%+ of your issues will start.
I did this 11 years ago. I bought a used Philips CSM84 (made by Yamaha). It has 3 nozzles, so can mount different size nozzles for different size range of parts. Although vision is an available option on this model, my machine did not have it. I never used CM's, I did it all by hand before. I made my first board within 2 weeks of getting the machine in. I hacked a big toaster oven with a ramp-and-soak thermocouple controller to do the reflow profile.
I have done close to 2000 boards on this system, now, and have had, maybe TWO real tombstones! I have had a few "head in pillow" defects where the paste never joined to the component. But, that is also fairly rare.
I do not teach the assembly, I get the placement file out of my CAD system and convert it to the machine's native file format with a program I wrote in C. I only teach non-standard pick-up locations, like from a waffle tray.
I do look at these Chinese machines, and the open PnP project, but it seems they just are not up to the capabilities of the commercial machines (yet). My very old (1995-vintage) Philips has excellent recovery from a wide range of errors, and tries to keep on going even when things are going wrong. I have only had to wipe the parts and paste off a few (less than 4) boards out of those nearly 2000 boards when things went seriously wrong.
Jon