I'd go back to the dealership first and see what they will do. If they aren't willing to take care of you, I'd shop around. Since our dealership didn't offer an Infiniti warranty (they only sell The Mechanic Warranty), once we found out that we could buy one from another dealership, our dealership gave us our money back without argument. We called Circle Infiniti of New Jersey and they have us a great deal on the full warranty plus they financed it. We found them through a thread on the Infinitijxforum.com. I believe the finance person's name was Sheri.