Thanks Havank, it is great being a member (at last!).
Unfortunately, it looks that is the best that could be done.
It seems that each A2 responds differently to a remap. Some get more that others. I suppose it would have nice to have had as much increase as you have done Havank but I'm still happy with the difference it has made. They tried to get more out on the first run but the plume of smoke from the exhaust was so great that the extractor fan couldn't get rid of it quick enough and the garage soon became quite smokey.
After they had toned it down slightly (also smoothed the power curve some more), the smoke was much less but it looks like the power suffered a little as well. I think we found the happy medium between the two, so it's not that bad really...