AEM intake is a plus, but i only upgrade intakes when i upgrade turbos.
its worth addressing the headgasket thats for sure. and if you have extra time+money i would build the engine. then its a matter of upgraded turbo, FFIM is never a bad thing, cams , not sure if you have full hardpipes but...