I'd suggest the CR2 files only - JPG files have had a considerable amount of pre-processing of their own - if you use LightRoom and can use the Raw-in-DNG-out method, you'll get greater control of the final output because the processing on a DNG is like processing a RAW