Nofap with a smoking fetish

I have a smoking fetish : for as far as I can remember I have been sexually attracted to women who smoke. Perhaps was it my uncle's second wife ? Or maybe it was the pretty bad girls in middle school who were starting to smoke at the same age I started masturbating ?

Fast forward 12 years later and this fetish completely controls my sex life. I realized that the most beautiful woman on earth would be of minimum interest to me if she turned out to be a non-smoker.

Most of the vids I jack off to are on youtube and involve little to no nudity. And here's where going on a nofap adventure becomes tricky when you have a smoking fetish like mine. Even if I can abstain from looking at women smoking on the internet it's as if real life has even more material to offer : the sight of a girl smoking at a bus stop, the smell on the breath of a classmate, hell even a butt with a lipstick stain on it will get me going.

I feel so much shame writing this and would really like my sexual fantasies not to revolve so much about smoking. I have managed to improve my poor social skills and low confidence and lost my virginity at the age of 20 (to a smoker). I have had a few ONS since and have been in a relationship for more than a year but I feel a lot of my social awkwardness comes from my overwhelming smoking fetish. Have any members of the nofap community experienced a similar struggle with their smoking fetish ? If so, how have you dealt with it ?

TL;DR : I have a smoking fetish and it is making me socially awkward when it comes to dating.