Ady, check that the MAP sensor you have is genuine. I put a cheap (£25) aftermarket one on mine the other day and had exactly the same issues that you describe, A new, genuine part (£100 or thereabouts) and it's good as gold.
Also check coil packs (x4)