I would say to keep your OEM intake and buy a K&N drop-in replacement. If you buy an ebay filter on a stick it doesn't come with a CARb sticker or anything saying that it's legal for road use. I would look into an AEM one because of them being road legal, it would suck to have a cop give you a ticket or even tow your car because it has "illegal" mods to the engine.

I would have stuck poles up the mechanic's asses if they gave me a D16Y7 when my car came with a D16Y8. Fuck that, you should have gotten the same engine, thats bullshit.