I think automation could probably be considered a subset of each item. Automation is a process not really a product. At least in this context the fundamental unit of wealth is the value to people. Automation per se doesn’t really have value to people, it’s the fruits of that automation that has value. If use a robot which uses automation to make a car, then the car is the thing that has the ‘created’ value.
If I write an automation program for some computer task like sending people information that they want, then it’s really the info that drives the wealth creation in this context. The Automation is just a means to an end, not the goal by itself.
Having said all that, I think Automation is absolutely the main driving factor in the massive acceleration in the amount of wealth being created. What will be really interesting is if we ever get to a point where whole industry verticals are entirely automated. If there is no human input or labour involved in mining, manufacturing and distribution of a product, especially if that product is only used by other autonomous system; what value can we as humans place on that item? Does it add value in any tangible way?