Yep, I'd sacrifice myself if that was what was asked instead. The reason I mentioned "killing a random person on the street" is that it's more informative - it sets a higher bar for the required world improvement. My morals say that killing someone else without reason is strictly worse than killing myself, so there exist possible world improvements for which I'd agree to kill myself, but refuse to kill a random person.

Your decision is not fully weighted as you don't know if in the world without wine people won't invent another much more dangerous thing that will ruin the lives of even more people and which will be even more harder to consume casually.