The way I understand it, type 1 is straight. Yours has wave that means its curly and I'd say 2a. That said, type has little importance - determine your hair properties to find products and techniques that will bring out the maximum curl potential of your hair. http://livecurlylivefree.com/curly%20hair%20basics.htm
remember, with all advice or suggestions for your hair, YMMV!!
My hair:
2b wavy, medium texture, low porosity, med-high density. Protein finicky.
My routine:
Cleansing: DCNP, every 4-5 days (occasionally use CJ cleansers).
RO: CJSC, occasionally use JCDC
LI: KCKT or CJSL
Gel: KCCC, CJCIAB for 2nd day hair (sometimes third)

Heat is my friend: warm water rinses, steam caps, and diffuse dry. I love CLU cloths and my Denman.