I have a similar situation but luckily have found some really good products that do hold a curl+
Ok now maybe I have to move onto the Oribe lol
I would look for a richer/heavier leave-in that will pull the curl down into waves. Something like+