Tough one. On AF, you get champagne in economy, but it's a 744, not a 340. Food had gone downhill on AF and had improved on KLM. Given (IME) AF always runs late, 2 hours isn't that long at CDG (although service to EDI is frequent) so I'd probably go KLM.