i'd go with the c&l......

any CAI that has two bends in front of the mass air will richen up the A/F and you can lose power......

i'd do a c&l and an upped intake tube and you'll be in good shape as far as the intake goes!