Hi Angie. The Hydrating Macadamia Oil Intense Moisture Mask is not CG, since it contains Dimethicone, Cyclomethicone, and Dimethiconol, all non water soluble silicones that require a sulfate shampoo or a coca. betaine containing low poo to remove. If the other product you referred to is the Macadamia Natural Oil Deep Repair Masque, it's not CG either, since it contains Amodimethicone and Trimethylsilosyamodimethicone. Again, non water soluble silicones you need a shampoo to remove. Of the two, the Macadamia Natural Oil Deep Repair Masque looks like a "better" product, but it still has 'cones, so it'd be a no go for me.
As far as deep conditioners, my hair is fairly prone to getting easily overconditioned, so I haven't needed to find one. In fact, I did my first dt the other day to help correct some overproteining, and I used my usual rinse out plus some additives. Maybe someone else can chime in on dt suggestions.