HFC's or replace my Borla headers
 

Ok, before I get flamed check this. I bought my 2006 G used and when I installed the spacer/CAI combo I noticed that the car already has Borla headers installed (and a Borla exhaust too). I've read lots of nasty things on here about the Borla headers.

My question is, would it be better to swap the headers (I'm considering Strups) or just get the HFC's first (FI's). I will be getting a tune in the future too.