If you swap to the H22 then get the intake the accomodate for the H22....that is going to be te same for any other parts from here on out once you swap.
As for the CAI you can just go on egay and get the intake and get the K&N or SPW red filter as it's made the exact same way as the K&N but not as pricey. Just depends on the amount of $ you may have to spend.
Also you could try like
www.thepartstrader.com and see if you might find on on there used. Good luck...