Actually, I think your collapse-empty-folders idea would be fine for this: as soon as there were other sibling tags that included assets, those wouldn’t collapse.
And by “collapsing”, I mean using the ... approach here:
...