hi fanfan, I would go for option 2 because at every wedding, there will definitely be people who want to drink beer. For Pan Pac, one glass of beer is about $9-10 so if you go by per glass, it may end up to be more.
As for changing corkage waiver to free bottles of wine, since you're already buying from Pan Pac then yes, this is a good move.