Trackbar hitting upper control arm

Alright, so Ive read numerous threads on alignments, caster angles and subjective to lift/tire size. Right my, my 05 LJ Rubicon came with a RC 6" short arm kit(yes I know Im slowly piecing it out with better parts), 37x12.50 MTrs, ZJ steering, Clayton trackbar. After installing the ZJ parts, I had a quick alignment done at the dealer, I dont believe they touched the caster cause it was 7* before and its real close to the same now. From what Ive read given the lift height and tire size I should be at 4.5-5.5* caster, but right now the trackbar will hit the upper control arm mount on the diff when compressed. Going to 4.5-5.5* caster would make this worse correct?!? Im trying to get this dialed in as much as possible, I realize the angle on my control arms and lift height and yada yada but whats my best bet when it comes to getting this aligned perfectly given my current situation? As of right now I have no steering issues, doesnt wander or death wobble but obviously I want to stop this from happening as its hitting right where the jam nut is and making the jam nut loosen, less than ideal Id say. From what Ive read, I can do this rather easily given the adjustable arms and can do it myself with the lengths of the arms so that information would also be greatly appreciated. Id like to get a new set up, maybe RK and Clayton but dont have the free funds hanging around with a wedding coming up so Id appreciate good insight on the issue at hand not tearing into 2k+ suspension set up. Thanks

Trackbar hitting upper control arm