You'll be ok with the stock tune, you'll be taking it easy anyways for the brake in. Do you have a scanner or scan gauge to keep an eye on things?

You'd probably be fine with a 3.6 with those flow mods but if you have the 3.8 toss it on there.