Being of fickle nature, I've had a think about this, and changed my mind again.
I voted for Category-based, on the basis/assumption that there should be a minimum amount of beers, say three, for a category to be voted on. No point in having a fruit beer category if there's only going to be one fruit beer.