Yeap. I have done that last time...like 6months ago .Injection cleaning and everything that you mentioned. Got the point with the air filter. I change them arround 20k km. Any other recomandations?