[Oz Cello]

Hard to know what to do about multi-movement works. For mine I mostly just save them as one piece but they're usually just 3 or 4 movements which is less unwieldy than a full song cycle. Using albums seems like a good set-up for song cycles. I think setlists are designed to be used to group pieces that will be performed together in a particular order so probably best to leave them for that and keep using albums they way you are. I format my titles so that for classical music the name of the composer is shown first. Would adding the composer's name to the formatted title achieve what you're trying to do? If you have the composer's name first then all the cycles by one composer would at least be grouped together.