I'm going to say 2b. Your waves look quite similar to mine!
fine, low/ normal porosity, med density, normal elasticity.
Dislikes: Aloe by itself, polyquat 4
Low poo (used rarely): CJ Curl Assurance
Co-wash: CJ Daily Fix
Condish: CJ Beauticurls Strengthening
Stylers: CCCCL, SCE FSG, SCE CHHE
PT: IA Girls PT w/ mag. sulfate, CJ Repair Me
DT: CJ Rehab or Deep fix