For you, I think both ideas work.
Since we are only using the cups and all the things they get will be inside of the cups, it kind of just makes sense to have them pre-assembled. If I was doing OOT bags, I would probably just assemble on site, as it may be easier to lay your bags flat, then try to pack them stuffed.