i live in massachusetts (finaly got my stang back on the road after a crappy winter

) and theres strict emissions tests we have to pass or no sticker. i have flowmasters already on and a fenderwell intake also. im putting on my underdrive pulleys this weekend. i have ford motorsport shorty headers im going to put on when i move to connecticut (no emissions) within the next 2 years. until i put on the headers, are there any mods i can do that will give more power (besides gears) that wont effect emissions? im getting an 85 mm MAF, 75 mm TB and an accufab plenum soon, but will inter-change them with the stock parts when it comes to emissions time. if not, should i just work on maybe a tri-ax, springs, any other suggestions?