Originally Posted by
OjaMentabe 
Pretty much all my free time in some way requires it
Really? Requires it? You can't seriously believe that you are required to drink.
I know you said no AA but just to correct your wording, AA talk about a higher power which does not have to be a person at all. Someone I know told me his higher power was time, which I thought was really interesting. I too am an atheist and do not use AA. My sister is an atheist and has been going to AA for well over 20 years. Be open minded.
You are a youngster, relative to many, and now is a great time to quit. I wish I had quit at your age.
As far as a diagnosis goes, there isn't one really. If you are unhappy about your alcohol use then it doesn't matter what you call it, you need to do something about it.
Welcome!