The OP's plan is sound, but I would agree with the suggestion to get €50 or so in cash before the trip, even if it's a bit pricey to do so. ATMs are strangely thin on the ground at CDG--at least I can never seem to find one when I need one--so I always try to arrive with at least enough cash to get into town.