Question on steering when converting from Dana 25/27 to Dana 30

Hello all, I picked up a 1961 Willys 4x4 station wagon in great restorable condition and intend to be restoring it in the next few years. I'm trying to keep it as original as possible, but the only two things that I am going to upgrade include the ignition (GM HEI off a 250 or 292 I6) and the front axle/brakes. I know there's plenty of info out there on the disc brake conversion on the Dana 25, but I was wondering what swapping an entire Dana 30 axle off a newer CJ would entail as far as steering goes.

The front Dana 25 on my wagon is about the same width as my wide track 1986 CJ-7 Dana 30 front (haven't measured exactly, it might be identical), so getting it hung on the leaf springs would be pretty straightforward. My only issue I've found is that the Dana 30 is set up so that the tie rod goes to the passenger side knuckle, whereas on the Dana 25 the steering box linkage goes to the driver's side knuckle on the back side.

I know a lot of people have done a Dana 30 conversion on their early CJ-5s, but has anyone swapped the Dana 30 onto their early CJ-5 and kept the stock steering setup? The few pictures I've been able to find of some of the conversions, they just used the newer Saginaw style steering box, but I definitely want to keep my stock steering setup for the sake of originality and not having to fab a steering box bracket on my frame.

I'd like to have a stronger open knuckle axle in the front, but does anyone have any ideas on how to do this while keeping the factory steering? Thanks for the ideas.