A longer yoke won't solve the issue at hand. All it will do is allow for the yoke to pull out further at suspension flex. Just make sure that it's not to long as it will also push in, and you don't want it to push in to far (ie. bust the t-case). The yoke length will not change the the placement of the u-joint on the d-shaft.

You have a few options.

The first and most logical one would be to do a t-case drop kit, as it will help change the angle of the yoke/d-shaft. RE makes one (LINK) for fairly cheap that should help. We do have it in stock...

Another option is to get a yoke that has more clearance. You'll need to make sure it's the correct spline count and for the correct size u-joint. The YJ yoke is longer, however it is not fully splined all the way. So what you gain in length, you loose in spline engagment (so it's kind of a wash). I don't know however how much (if any) clearance the YJ yoke would have over an XJ yoke. I want to say off the top of my head it's very minimal.

XJ 2wd and 4wd yokes are a bit different, but one again I'm not sure how much (if any) clearance a 2wd yoke would give you.

And lastly, the good ol grinder. Depending on how much it's hitting this may be an option. Just remember that as full suspension flex, the d-shaft angle will get worse, so you need to make sure you have plenty of clearance.

The correct solution is a SYE and CV style d-shaft, but you already know that. I'd start out with a TC-drop and than see where you stand.