Have you ever considered the curly girl method (CG)? Here is a link for more info on that:
How to Follow the Curly Girl Method for Curly Hair: 15 steps
Moroccan Oil products are loaded with silicones, which can build up on the hair. That build up can definitely mess with your natural curl pattern, and it can also cause additional dryness/issues. Removing silicones and sulfates from my hair regime has helped enormously in the health and look of my hair... it's not for everyone, but I recommend looking into it if you're looking for a change.
I did not personally have luck with the DevaCurl products. There are several low and high end product lines that are CG/curl friendly. Many people have luck with Curl Junkie.