Heaven in hair doesn't work that way for me either. It works well for me as a leave-in/styler, though.
For deep treatments, my favorite is Curl Junkie Curl Rehab (strawberry)
2a or b, highlighted, fine hair but lots of it
Modified CG since 6/11

Low Poo: CJ Daily Fix
Co-Wash: DevaCurl No Poo
Rinse Out: CJ Beauticurls Strengthening Conditioner or Deva One C
DT: CJ Rehab
Stylers: Deva Heaven in Hair as a Leave-in, followed by Arc Angel