Considering wine isn't necessarily done until you drink it maybe putting in a harvest date instead?
still the block height seems to vague. you're right that a bottle isn't finished until it's empty