[Kracka]

I'd take the AEM intake over the AMS due to MAF pipe diameter; plus it's boxed helping keep heatsoak down at the back of the engine bay. Honestly, moving the air filter won't really do much assuming your intercooler is operating efficiently, but taking the weight (battery) off the front wheels will do more. If you moved the battery I'd imagine you could run an intake designed for the X.

Speaking of intercoolers, may I suggest you at least upgrade to a stock X FMIC?