Mate I waited until after my warranty to get the edit. I regret not getting it done earlier. The way I see it, some people have no problems with just an edit and some people do have problems (me)......so it wouldnt matter if it was under warranty or not becuase if your car doesnt like an edit then your gonna have to pay anyway. I think your concern should not be about the warranty......but should be about having enough cash to fix things that break. If the answer is Yes then get the tune now, if the answer is no then don't get the tune.