You have took it to main dealer, that's your problem,
Take it to a local trustworthy garage and they will do it all for well within your £1000 per claim warranty
Every time cars go to main dealer they do there "free visual health check"
Which is touting for work