Up until recently (last couple of years) I never had a paint job take LESS than a year from any of the top guys. I still have a frame at a Nor Cal shop going on six years.
I would not ask for a discount, but I would insist they re-paint it the correct color, and restore the badge.
It's easy to guess which shop you are dealing with and would think there would not be a problem having them make good on the job?