you are suffering from a common, yet dangerous illness, medically known as "socialis smokerysis".
but really, what i suggest you do is try to substitute the cigarettes with something else, while you drink. let's say, a pack of peanuts. it might help to "cut" the mental connection your brain does, which links drinking with smoking.
p.s.
on a personal note, one thing that helps me keep away from cigarettes is to remind myself of the stinking smell of smoke that remains on the hand and fingers for hours to follow.