While I'm not sure if he also does body work, I can't think of a better shop for other Jeep work than Stan's Jeep Performance shop & store in Yucaipa. Give Stan a call at 877-795-JEEP, he'll take good care of you. Not to mention he's an active Wrangler Forum supporter & participant, and he participates in all of our offroad runs too... great guy!
Not to mention he would probably have a good referral for a good Jeep body shop if he can't take care of what you need.
Click on http://www.jeeperformanceinc.com/