The caterpillar looks similar and the moth also matches. I'll see if I have an old picture of the hairy black thing. I have observed two types of these hairy creatures. One is small and remains small when it pupates. This one seems to be of the larger type which does not proliferate as much as the little ones which is a problem with our tiled roof and old walls.