I agree with most of that, but have a couple of notes:
The cost of storing the products should only be used in COGS if it is a variable cost that goes up and down depending on how many products you are storing / selling that month. If the storage cost is just a fixed cost like rent, you should not include that in COGS, since that is not a direct cost to the product.
Direct labor can be included as long as the labor is tracked to only include the time spent actually making the product. If employees are doing other things like cleaning, stocking shelves, answering phones, talking to customers, doing deliveries, etc., than labor should be looked at as a separate line item. Most food and beverage businesses just look at labor as a percentage of their revenue on their P and L, and do not include it in COGS. A wholesale juice company would be more likely to include labor in COGS.
I don’t think factory overhead should be included, unless it’s only the direct labor as mentioned above. Chances are most of the factory overhead are fixed costs like utilities and rent.