yeah wait until you swap it to put the headers on...you have alot more room to work on it!!! also if anyone is wantin to do a cam when you do the swap that is the best time for it!!

Traeger2591: i did a swap on mine and used parts from a 97 buick riviera and they work great...you might wanna get the heads sent away to be magnafluxed just for safety assurances...lol i had 2 cracks in mine!!