First paragraph, agreed (excepting highly addictive drugs).
I suppose you could argue someone were searching for agency by doing a self destructive thing. I don't think willpower comes into it. Although I would agree willpower and agency are related insofar as if you don't feel you have agency, its probably hard to show much willpower.