Have you considered going CG? If you really want to go with your waves and get full potential of your waves, I'd suggest ditching all products with -cone, -conol, -xane in it. Like most wavies you could use a clarifying poo (the HE you used will do) every other week or so.

When the roots feel flat after clarifying it might not be build-up but just the absence of sebum and moisture that makes your hair flat. I always get this after using a SLES poo (once every two weeks or so).

2b-c/3a med/fine- low porosity- normal elasticity, BSL
2B/C-3A) fine - low porosity
Wash: Daily Fix,SMT, Kesham, Urtekram
RO: Motions CPR Li, Inecto Cocos co, AO GPB, KCTT
acv-rinse, sometimes honey-rinse
LI: coconut oil (winter), CJBC-LI
Styling: AVG, Etos Solid Power Gel, Taft gel, CJPP
Plopping~Pixiecurl diffuse~clipping