Yes; that's inside the timeframe to get it all on one account! And, if things remain like they have been in the past, by going to DLR second, you might find that you will get the DLR price on the CD.
You can combine them. Just make sure you add Disneyland last. I went to WDW the end of last May and then to Disneyland for the 4th of July weekend. I added the WDW pics in mid June (before I was planning on Disneyland for the 4th of July) and then added the Disneyland pics right after I got back. When I ordered the CD, I got the Disneyland price because it was the last place I had visited/code I entered.