Best advice would be leave it as it is because they build the cars as a package rather than just bolting shiny stuff on and hoping for the best.
If you're dead keen on more power, 2.8 is really the way to go.
Dont stress the AFM's - the ones you have are certainly not cheap and while yes it's better to have MAP in some people's opinion (including mine), you'll be spending money on that swap for no real gain in HP. For example, if you take the AFM's out and sell them you'll get about $700, and then about the same for the PFC (it has a super expensive tune on it now which will be thrown away), so lets say around $1400. Now, you'll need to buy another ECU so lets say you get the Link G4 which is popular thesedays, thats $1850 inc the map sensor it needs as the on board one doesnt read high enough. So you're out of pocket $450 at this stage. Now, go have the board put into a stock casing which you'll have to find from someone (say $50 or slab of beer), then map sensor installed into the engine bay, then tuned, you'll spend at least $1000 on that being done by someone who knows what they're doing. So, $1450 approx spent and all you've done is delete the AFM's which are the best on the market anyway.