Clean your WHOLE life, don't just do NoFap and still have all sorts of addictions ! Don't you do NoFap 'cause you want your LIFE to be better ?
You just gotta be stronger than your addictions and predilections , my man. Don't give it power and stay true to your purpose. Think about how you'd feel afterwards, not proud of yourself, I suppose and that's a good enough reason/motivation for me to go on.