5º down doesn't sound bad, your front pinion angle should stay close to correct despite your lift. I would not install a CV front driveshaft or put shims on the front axle, I would look elsewhere for your problem.
There are thousands of YJ's lifted without that problem, look for a worn or out of balance part before doing any uncommon modifications like the CV or shims.
Your front pinion should be parallel with the front output of the transfer case, so the pinion will appear to point downward from the driveshaft. Grab an anglefinder and compare the pinion and TC output angles.