If the dealer screwed it up the dealer should be fixing it and/or paying for it !!! customer pay or warranty either way the dealer is at fault, you may want to try another dealership, I had almost the same things happen to my first xfire, took it to one dealer and they messed it all up so I called another dealer and spoke with the service manager and they took care of all of it, but mine was under warranty.