Smog Legal Headers/ Cali laws

[54Caddy]

I am wanting to upgrade my exhaust system on my truck soon. But living in california is a pain. My truck is a federal truck and does not have air injection, my problem is finding smog legal shorty headers with out air injection. Would i be able to run regular headers and still pass smog because the truck originally doesnt have air injection?? I know i can order them with the holes and plug them up but to me that would not look nice at all. Also my truck is a factory 2 barrel truck and i want to add a four barrel would i be able to use a 4 barrel setup for smog and still pass or would it not work because the U code in my vin states it is a 2 barrel truck.

Issue Number 1: Smog Legal Headers w/out air injection
Issue Number 2: Converting to 4 Barrel Carb and still be smog legal

Thanks for any replys and if there is a good smog tech from california on here your knowledge would be appreciated.