One thing I notice is where you say it's not curling, it looks like it might be winter, cold - my hair tends not to curl as much in the winter....in your other picture it looks like it might be summertime, maybe that's part of it? I know my hair goes from 3a/3b to 3a-3c during the summer. Maybe between that and if you have been using products with silicone could be pulling out your curls.
You have gorgeous hair either way!!
Cowash - No Poo, Suave Coconut
Conditioner - One Condition
Leave In - KCKT
Gel - KCCC at the moment
My hair is about the same wavy as yours in the second picture (well, not as shiny, LOL, a little woolier) when I'm here in FL but when visiting New Jersey it went completely flat, not nearly as nice as yours looks in the first picture.
I would vote be very happy with the winter hair, it looks great, and wait for the humidity to return with the summer!