Commonly, questions regarding figures deal with including, floating, captioning, referring, sizing and positioning and the like, typically involved packages are float and graphicx. However, if questions concern diagrams I believe it's mainly dealing with producing them. Until now, all questions tagged with 'diagrams'tagged with 'diagrams' are about typesetting and drawing, without mentioning the word 'figure', typical packages are TikZ and PSTricks, like you said.
If I'd like to create a diagram, perhaps not sure which package I should use, I would be glad to have a [diagrams]
tag to browse such questions. They don't get lost among questions concerning prefabricated figures.
Finally, the tags [figures]
[figures]
and [diagrams]
[diagrams]
are not even related, as I can see on the side bar.
So I believe we should not merge those tags.