Dyno numbers seem just a bit optimistic. Does the tune seem safe?
...at this level, headers will cost more than they are worth.
What was your injector duty cycle? Unless this was high new fuel pump and injectors will net you 0. They will, however, be needed for later upgrades so should be considered worth while upgrades.