ZJ,XJ,MJ track bars and control arms are all the same.
2wd drive axles are the same except for the mid 92 and older have normal 2wd spindles and 92 and newer have the same unit bearings as the 90-98 4wd they just have a stub where the outer shaft goes.
Your sway bar is probably what's limiting the travel on your front end.
You need to make sure your axle is centered left to right and then see how far your track bar is off, may have to go to an adjustable one.
ZJ up country springs will give you a few inches over the stock 2wd springs.