I would check the throttle bodies are working together first. If they're out, it can cause the symptoms you describe, ie hesitation, but not so bad when you drive aggressively. It would also cause the surging.

Just seen you're in the UK, have you thought about sending it down to Carrera Sport ? They know these cars better than most.