Have you ever tried the Collect Samples command? I beleive it does exactly what you’re after.

Never really had the problem you’re describing over three years of daily use. Set your preferences to save samples in your projects and the thing pretty much organizes itself.