WSM370

The day I test drove my 2013 it was covered in dust from from sitting on the lot. The day I picked up my car it was raining, I drove an hour to pick it up and when I got there it was outside. I should have known better, but I thought its brand new never had a problem in the dozens of new cars I've purchased before, so I'll just trust that things will be fine as always.
A few days later after washing my car with a new microfiber wash mitt and best soap and 3 bucket process with grit guards and the whole deal and the meticulous process of drying to avoid any damage to the paint. I find the car has scratches all over it, like the wash attendant washed it with a mitt filled with grit. I called the dealer and explained to them what was going on. They said bring it back and they would buff it out, no problem. After 4 hours of driving to drop it off get loaner and then driving back to pick it up. I see my car outside on a bright sunny day covered in swirl marks and still has every scratch in the paint ? I'm so pissed I can't see straight, so the manager gives me a We Owe : for $ 320.00 dollars to have it done by a shop near my house that has an awesome reputation.
Got it back today and the shop says it got a lot of scratches out, but still has a dozen scratches all over that just won't come out. The dealer wants me to bring it back and wants to repaint my 2013 car with 1600 miles !!! Anybody have any idea how much something like that might cost ? I would rather ask for half that amount in cash and my spent some on mods & maybe a good wrap job ??? Any input would be awesome, especially if you know what a repaint would cost the dealership ?
Thanks Bill