What I found to help me out a whole lot with this problem was a strong tobacco flavor. I noticed when I drink the fruity/dessert flavors just don't cut it at all. After a lot of trial and error I found that a red tobacco or very earthy tobacco flavor helps me not want a cig when I drink. I'm a huge Jack Daniels fan so the more earthy a tobacco the better!
Oh i agree the fruity/dessert flavors are a no go for me. I am a bourbon drinker and those two do not mix well at all. I have to say i am with you also on sticking with tobacco flavors, i generally vape trebeca but have been experimenting with other tobacco flavors as well. They all seem to be within the ballpark of going well with my choice of drink. It's just hard to believe how strong of a hold cigs have all this time later with me, but only when i drink.