Personally I wouldn't even get headers until you do the heads, the gain is not worth much. The installation is a pain in the ass, if you don't do it yourself, shops will charge you an arm and a leg, for 5-10hp!
If you do it when you get heads it will be MUCH easier, cost effective, and...