Ditch the CAI. They specifically designed the map for stock. That stock intake is fine for stage 1 and 2. There are plenty of other places to find power before having to resort to the intake, sell it and get to stage 2. Upgrade the intercooler. Worry about the intake once you start planning on upgrading the turbo, it's a waste and will only cause prblems on your current setup.