Perhaps you're over-thinking this a bit. In my case, the issue isn't what I drink, but that I drink at all and the amount. My personal goal is to stop altogether, so whether I had a beer, or a glass of wine, or a mini cocktail isn't as important as the fact that I had 6 of them in the course of a couple of hours.
Since they don't have the categories you want, I think you could make up your own rules for where those things go. Just decide that a cooler is the same as a glass of wine and put it there; consider a malt beverage a beer, etc. I think accuracy isn't as important as awareness of what you're consuming. Good luck!