The curl junkie I'll always co-sign on, especially the one you just mentioned. If you do have heat damage I'd reconstruct with this one perhaps once a month. I tried it this past summer when my hair just emerged into land of the damaged and it took to it immediately! I also tried the Elasta QP DC and didn't care for it too much. My hair was just confused and once I washed it out it was as if I'd done nothing. ( I have an almost full jar if you're willing to swap

As for a leave in, I've tried the Giovanni, as have many folks out there it I liked it because it's light and has nothing but good ingredients. I've stashed it away though for my summer do's because it is so light. Right now I'm using the KCKT leave in because it's a bit more moisturizing for my hair now that we're in winter.