It sounds like you might need more gel. As far as the MoroccanOil stuff, I say use what works, and don't stress labels like CG, etc. But that's just me. As long as you're low-pooing regularly you shouldn't have any buildup issues. Just make sure to evaluate your hair for dryness, etc to make sure you're still getting enough moisture.

Modified CG since 11/5/11
CLEANSE: CJ Daily Fix, DevaCare No-Poo, CHS Treatment Shampoo
RO: SS Caitlin's Conditioner, CJ Beauticurls Strengthening
LI: SS Repairing Protein Treatment, CHS Silk Leave-In
STYLE: Re:Coil, Curl Keeper, Deva Ultra Defining Gel, Curls Rock Amplifier,Sweet Curls Elixirs Okra Gel and Hard Hold Gel, SS Curl Enhancing Jelly and Firm Hold Gel