I wish you well, but I've never known the "replace drinking with a good habit" approach to work. It's simply another way of attempting to control alcohol, and it doesn't really get at the real issue, which is: alcohol cannot be controlled.
To put it another way, using distractions to control drinking feeds into the losing battle of fighting alcohol.