Aristotle's third element wasn't 'wind' but 'air'. Further, he believed in the possibility of a fifth element, 'aether' .
His model saw 'hot' and 'cold' as two distinct entities, rather than 'cold' simply being the absence of heat. (Incidentally, I saw it that way myself up until my secondary school education, where I was initially puzzled that my science teacher kept making references to 'heat' but never to 'cold'). He likewise saw 'wetness' and 'dryness' as distinct entities, rather than 'dry' simply meaning 'not wet'.
As the concepts of 'hot', 'cold' 'wetness' and 'dryness' formed an integral part of his four-elements model, attempts to link his elements directly with the four states of matter that are currently recognised by science might be a step too far. However there are, of course, clearly some analogies.