CJ3A Steering rebuild

HI:

I'm just new to the forum and was hoping I could get some advice on rebuilding the steering on my '52 CJ3A. A previous owner had removed the original system and replaced it with a steering box behind the front bumper. Trouble is he did a terrible job. The jerry-rigged system was very unsafe. And he cut out and moved the frame crossmember where the bell crank should mount.

I'm now doing a frame-off rebuild and need to reinstall a new steering arrangement. The existing steering needs to be replaced. so, should I reinstall the original system the Jeep was built with or should I look at continuing with a Saginaw steering box mounted up front and just do it in a better way. I'd need a different tie rod assembly for that.

Any comments would certainly be appreciated.

Thanks.