I would say you are more in the type 2, either 2B or 2C. It's hard to tell if your hair will curl up more once it grows out but I would defenitly say type 2.
The longer it gets, the more curly it gets. IS that characteristic of any of the types ? My hair is so challenging.