To the OP, people have gotten a little far afield on you. Based on what you've indicated that the use of your TJ will be, your best bet is probably go with a Y-type steering linkage. You do not need a new knuckle to switch to a Y-type steering like one from Currie (though theirs is beefier and more expensive than you probably need)(see the last sentence of my post before you buy anything); you'll just abandon the upper Teraflex mounting point. If you were running 17" wheels, your clearance issue would be eliminated by removing the drag link from that upper mount, but with the 15" wheels you may need to do some grinding or even complete removal once you test fit the wheel without the spacer. If so, you could probably find someone to trade you a stock knuckle plus something on top for the Teraflex knuckle. Some of us with 5"+ of lift prefer to utilize one, but debating that is for another post, not here. You will probably need to address the clearance issue on those aftermarket sway-bar link mounts when the steering is cycled to full passenger turn; it looks like you will have an interference issue there. On a side note, PLEASE but a steering stop bolt back in whichever knuckle you use before you damage your steering box from over rotation; looks like the original owner removed at least the passenger side in an attempt to get more left turn. We can't see the driver side in your pics behind the tie-rod, but I'm guessing that side is missing too.
As far as your track bar goes, remember that whichever way you modify it, try to keep it as close to parallel with the new drag link angle. Your can remove the upper bolt-on track bar mount at the frame side to give you some additional angle. Hopefully the factory mounting hole is intact, but we'd need to see a side pic of the mount to judge if it's been drilled for a thru-bolt or has a tapered bolt adapter. Your axle side track bar mount has been welded over by the previous owner but you might be able to re-drill in the factory spot. If you do switch to a Y-type drag link, you'll want to make the track bar as long as possible while still keeping it parallel. You could Okie it, and drill a hole straight through the weld-on bracket at the axle side to change the mounting point while still using the track bar you have, but I wouldn't recommend it. The heim will no longer be in double sheer but the bolt will be, and for what your intended use is, that should be fine, but refer back to my previous statement.
If you decide to go with a Y-Type, you should read this thread before buying anything though:
https://wranglertjforum.com/threads/zj-steering-upgrade.11895/