It seems that you may be unfamiliar with the concept of compulsion. All you've done is water down the word "want" to meaninglessness and uselessness. It distinguishes nothing in your theory.

> As far as I understand it, a heroin addict, at times when he's not craving and has some choice, has a choice to continue doing it or to go through hell and then some.

No, not at all. I think your understanding depends strongly on your ignorance on that subject.