hmmm. well that thought came in my mind as well. did think of sharing with u but then, thought of thinking something more useful for you.
Baat tu ye sahi hai bhai k warranty is useful when u have the car with you. No car means useless warranty. Even if ur car is insured, still in case of any incident, u'll lose it, along with the hassle of claiming the insurance money.
Can u go to that mech again and ask him whether he can do the job with the minimal amount of opening and closing so that warranty guyz have to work a bit hard in order to detect if may be the wire position has been changed?
Or probably, u can go to some toyota 3s for the job. Cz afterall, its their mess u are trying to clean up. :-!