I know CP-E has a CAI for 2nd gen. They make good stuff.
Mazdaspeed has a CAI for the 1st gen, don't know about the 2nd gen. If you don't want to deal with warranty stuff, I'd go with the Mazdaspeed CAI. It's made by AEM, so MS CAI and AEM CAI are pretty much the same thing. Also, both are CARB legal. I live in CA (SF too!) so that was a plus.