Optimising Transaction Order Fulfilment Flow Based on Specific Products

Hi All, I would love some help / advice on how to optimise my current two post purchase Order fulfilment flows. 

Summary: I sell products that have different shipping times, one set of products 3days (A) , another set of products 5 days (B). 
I currently have two post purchase fulfilment emails to send the customers tracking details, one for product set A after a 1 days wait & one for product set B after a 4 day wait. 

Right now I have the emails created as two separate flows based on Trigger Filters ‘Fulfilled Order’ using the product names & having to include/exclude the products in the two separate flows. 

This is becoming a little difficult to manage as things are growing & I’m hoping for some advice on a better more efficient way to do this, I’m thinking one flow with splits, but when basing it off ‘properties of a fulfilled order’ my tags from shopify arent there and the only useful thing is the product name, which then brings me back to the original issue of manually updating. 

Any help or advice would be greatly appreciated!

Thanks for your time!