I would go ahead and save yourself some money and tune for the headers and 3.6.

Matter of fact..the tune I've been running from him I had for awhile and it was tuned for the basic 3.6 set up..headers,intake,tstat etc. and I was running stock manifolds, stock 3.8 pulley etc and still noticed a big difference.