OP... the best body shop I have found is called
OC Bumper and Body
They do amazing work and are some of the best in the business at color matching. The owner is named Daryl and is a really nice, and more importantly, honest, guy who will take care of you. I had a similar issue and he tried to do everything he could without having to paint it free of charge before ever talking about costs to paint, etc. They are located where the 5 and 405 meet.
Check them out here...
OC Bumper & Body - Auto Collision Center
Yelp reviews here...
OC Bumper & Body - Irvine, CA