I like your hair curly much better. Definitely go CG...just look at the before and after thread if you need inspiration. I don't know if you've read these or not but there is a ton of good info on curls and CG.
Live Curly, Live Free
Laura Lee's guide to going CG
It seems you already use some CG products so it wouldn't be that hard to go all the way.
High Priestess JessMess, follower of the Goddess of the Coiling Way and Confiscator of Concoctions in the Order of the Curly Crusaders