I can relate with everything you have said and it sounds like you're already on the right track but if you're not experiencing W/D please god get your drinking under control before you start experiencing it and are totally dependant on the drink. Once you start experiencing W/D you will likely never be able to drink ever again (as is the case with me). As it stands, it sounds like you still have time to change your behaviour and drink responsibly once you have it under control. In my case, even if I'm under control and just have a few beers or drinks, the kindling kicks in and I start experiencing W/D like symptoms. My drinking life has come to an end and being only 30 this is an extremely depressing thing to accept.