I talked to someone that was done dirty by the same dealership. He said call Toyota's headquarters directly. He had his car in 4-6 times for the same thing , they never fixed it for him. He finally called the headquarters and it was handled within 2 weeks.
Sometimes you have to go way above people's heads to get thing 's done.