My suggestion is that you check around for an "independant" service provider/repairer, one who specialises in Toyota (has Toyota acreditation, and endorsement), who can often beat the dealer service departments in many areas, ie time, cost, customer service, warranty, as they don't rely on the name of the vehicle bringing them repeat business, only their level of service, and customer care. Make sure their work is guaranteed and that they use "genuine" parts where possible, and that your Dealer Warranty is not compromised because of their work! Like a good doctor or a Dentist, people refer to their car mechanic as "My Mechanic" if they are given good service and are treated well, and not charged the "earth" for it.