We're also having this problem. 90% of our orders are custom items so this problem makes for a fair amount of unnecessary work. Hoping Shopify can find a solution!