Well, the fact of the matter is that all CJs ultimately end up being modified with Toyota parts. In Pakistan the situation is very acute given virtual non-availability of original Jeep parts and only second rate stuff available where possible. Nevertheless, outside the US, the situation is supposedly quite similar to us with varying degrees.....
The first standard modification with good results is to replace the steering box with a Toyota one. This should take care of the wandering and the over responsive steering bits which apparently have always been a weak point of the CJ5 and CJ7 setups, particularly the Pakistani assembled ones that were quite inferior in make and quality. There might be a few other minor jugars on the steering assembly which I am not aware of but the Rawalpindi jeep makers have standardised over the years....
On the driveline, you did not mention which gear you have but I suspect its a Toyota one. There is a modification to the shafts which converts the crosses/assembly at both ends to a full Toyota ones which are more rugged. Normally one would have the Jeep/Dana setup on the diff ends and Toyota setup on the gear ends of the shafts. The Toyota ones should work well even with high driveline angles....
Bumpy ride is something that should not be a complaint on a CJ if you have the leafs set up properly and have decent shocks. There is no match of Rancho shocks (even second hand ones) on a CJ5/7 but any decent oil shocks should do a good job. Another thing to note is that the CJ7 has a stabilizer bar at the front which improves handling (and some extent the ride) by a huge amount. Not fully sure if its there on the 5 but usually it gets taken off and discarded by local mickeys over the years. For hardcore offroading the stabilizer bar should ideally be disconnected....
On brakes, you eventually end up with Toyota stuff as well, which can't possibly be the best solution but is rugged and practical....