Have the soundset specific oneshots be in the top right as they are now, but have the bottom right (currently app-specific or owned-sets-specific?) be a static-collection place you can drag oneshots from above to have them in any soundset.
This would let you quickly make on-the-fly oneshot soundboards as unexpected things evolve in the game.