yeah id go with an aftermarket Intake as well...and ill suggest a Pro-M 80mm to go with it just so that while your doing all this you can build yourself a good homemade cold air for a nice setup....ill suggest the performer just on personal preference, but the Trickflow is fine...no matter what aftermarket intake you buy it WILL NOT fit under the stock strut tower brace, doesnt matter if its Edelbrock, Holley, Trick Flow, or even the Ford intakes (Cobra, GT-40, Explorer). So you will either need to ditch the brace or buy an aftermarket one that will fit. I say Intake now and not heads because i think i would hang myself if i took some beautiful aluminum Edelbrock heads, or AFRs or the sort and bolted that restrictive as hell stock manifold back to them.....and you wont see near the full gain of the heads with the stock intake.....
....just my $.02
Anthony