I took the high road from the beginning, and give every job a complete folder tree and LR catalog. I convert CR2 to DNG, toss the CR2, keep the DNG/catalog/exports all in one package, and archive that bundle when the editing is done. I lose the ability to search across all of my photos, but gain the ability to move jobs across computers quite seamlessly.