Logistically the second option, flying the whole way on KLM makes more sense. My understanding is that starting trips in CDG can sometimes be a little more time consuming (although you are in J), but why pay extra for a night in Paris just for the sake of flying AF, when there are more straight-forward options ?
A last minute, or even close-in swap of appareils can never be ruled out on AF/KLM.