It seems like you have made some positives steps but aren't done yet. Have you tried to deal with the headaches with over the counter remedies? Maybe if you tough it out for a few days you'll find your headaches subside. I found many of the problems which "caused" me to drink disappeared after I quit. And, of course, nothing caused me to drink but me.