Yes they are essentially the same, the serpentine ones reputedly have better idle control (in part due to the 5am air flow meter) and may have other minor tweaks but all should perform the same.
On the subject of air flow meters, you can run an early ECU with a 3am or 5am meter, but not a later ecu with a 3am meter. The 3am's are rubbish anyway so putting the later variant on is sensible.
Mapping, depends how capable you are with computers and electronics. I can offer a map and fitting it into your ecu (requires soldering a new socket and chip to the board) with a good driveable engine without the mid range flat spot. Its a few weeks away from being ready I need to sort my own car out first but drop me a pm if you are interested.