Better power steering

So I have a 1966 cj5a which I purchased in July. The previous owner had done a lot of work and upgrades like power steering, lifts, HEI, etc. in doing this he did a lot of damage to the jeep. The power steering he had "professionally" done but they did a rather **** poor job in my opinion. They put a Saginaw gear box with the Chevy steering column but they put it at an extreme angle putying a lot of stress on it so when your steering some times it's too hard to turn because there's friction in the joint and then it will get past the friction point and just easily turn so it's just throwing you around the road. I've been thinking about redoing it my self and maybe putting in a newer jeep TJ or YJ steering column in it. How easy would this be or not be? Or any ideas on how to fix the Saginaw issues?

 

Can you post some pictures of the existing set-up?
This would help in determining what your next step might be.

 

Also - there is a thread in the "Builds" forum that is just pictures and discussion of Saginaw steering swaps. http://www.earlycj5.net/forums/showthread.php?17911-Saginaw-power-steering-(pics)-please-add-yours!! You could read through it and maybe get some ideas about how to fix up what you have now.