Thanks for the suggestions.
I decided to go to Shaffers Offroad in Alameda, heard they do great work and been around over 20 years.
4wheel Drive Shop | Alameda California | Shaffer's Offroad
They did a great job and everything runs smooth again.
You mind sharing how much did it cost you and what gears did he use?