I would take B. I think CDG is nicer than JFK....if you get the AF Club on pier M, it is a great place to spend the time. You might have to rush a bit at JFK.