Just make Old Swordsman sell the wines and thats it.
but this is a lazy solution :/
i like it more when we make mistakes...it reminds me this is still a game...and i still need to use my brains.
so going inside and forgetting about the wines will be "oh snap gotta og out again"
thats fun xD
not necessarely dumb or boring.
what i suggested to Agatio is that we add teleport stoens to all the majot cities + wine seller beside it.
i think its good enough :/