Shark are holding a dyno day which will include discounted maps on the next bank holiday - 29/08.
Its actually being organised for ASN members but all are welcome, I'll be going along for a nose. Ben the owner of Shark is from a software background but doesn't write the maps himself but isvery capable at tweaking them to suit your cars set up and your requirements, he has an excellent reputation.
I've used Superchips/|Bluefin on 6 different cars now and despite a few minor issues the customer service has always been excellent - the power claims have not been so reliable.
Also used Evolve for my diesels a superb company based in Luton that also do an STS type handset and have a dyno dynamics RR - again nothing but good things to say about these Guys so another option for you.
Of late I have had the last 4 VAG cars mapped by Revo and all I can say is Wow
Can be a little more expensive than the competition but guaranteed results everytime, does what it says on the tin end of.
You could always use their switchloader to reload a stock version of your map ?
I'll be getting this latest car mapped by Revo sometime this month once I have finalised my hardware set up - on my second variation of Milltek right now :)