The replacement shaft from Borgeson is probably the most common fix for the crappy factory one. As for the steering "catching" in turns, this condidton is usually caused by a siezed universal joint. (the one that's in the steering knuckle on the 4x4 front axle) To check and see if this is the problem, jack up the front end, turn the wheels all the way to right or left, lock the 4x4 hubs (leave transfer case in 2wd) and try to rotate each wheel. They should rotate freely. If it does not rotate freely, turn the wheels back to straight forward and try to rotate wheels again. Even if the universal joint is seized, the wheel will still turn if it's pointed straight ahead.
Hope this helps,
Sean