There is a mechanic out at Frahm Chrysler, Jeep & Dodge in Norco. He belongs to one of the off road clubs which met at Don-A-V while I was still there. He really knows his stuff and will make sure that your Jeep is fixed the right way. If you are going to have a dealer look at it then I would recommend starting there. Don't remember the club but it is either Fun In The Sun or Sons of Thunder.

Your best bet would probably be a place like Off Road Evolution, Currie, or T & J Performance.