Welcome sobersalvation
I was in the much the same position as you. I tried to be a non drinker but live my old drinking life - same friends same haunts...
That didn't work out so well for me, I'm afraid.
The only way I found to stop drinking and stay off the drink was to make some pretty big changes in my life.
4 years on, I don't regret it
you'll find a lot of support here - welcome!
D