alcohol aficionado

A person who has a lot of knowledge about and is enthusiastic about alcohol, but "isn't an alcoholic."

"I'm not an alcoholic, I'm an alcohol aficionado!" - Hamish Duke, The Order