I thought about this for a while and looked at how Wikipedia does it etc. and in the end came up with this plan for the categories:
As you can see it's an easy to follow hierarchy, the main categories are reserved for the corresponding article, only use the lower ones for vehicle pages. Otherwise a category within an article might link to its own sub category which is bad.
It's up for discussion!