Rather than larger drinks vessels or consolidating barrels, which have their own problems (The large winery barrels were never intended to be drunk from, as doing so would just spoil the wine faster, drinks need to be stored in vessels small enough that one can drink the entire vessel in the time between opening it and it spoiling, and consolidating drinks will only result in faster spoiling of drinks) a simpler solution would be to have dwarves prioritise drinking more intelligently. Some kind of multi-variable system that takes into account the age of the drink (drink older drinks first because they'll go off sooner), the number of units remaining in the barrel (drink from barrels that have fewer units in them first because it tends to free up more barrels), and the dwarf's personal preference (drink booze that they prefer, because it more efficiently generates happy thoughts).
As for reducing the amount of space taken up by drinks, barrels probably don't take up the full height of the room (25 units of booze weighs about 80 dwarfpounds, and a stone that is capable of walling off a square weighs 800 dwarfpounds, rock is about three times more dense than water, so stacking barrels three high floor to ceiling sounds perfectly sensible), so one should be able to build an impassible (since it represents a floor to ceiling shelving unit) wine rack-type building in stockpiles out of the standard furniture materials or carve a wine rack directly into the rock. Each wine rack can contain three barrels. One can either use normal stockpiles, which are free and easy but take up more space, or rack mounted barrels, which are more space efficient (but won't be more walk efficient unless well-designed), and require workertime, resources and planning to use.