540demon

ok guys-i got another stupid newbie question. ive got a 4 cyl 5-speed 86 xj with a rough soundin noise (when in 4x4) thats its worst when under a load. its got the cv joint (t-case side) front drive shaft. the boots split,looks dry inside,an has plenty of slop. thats almost gotta be the noise.
also i have a 3 in. lift and the joint is close to being maxxed out (the angle) sitting on level ground. when it droops on that side its gotta be screamin!
so..im wondering if i could get a yoke+driveshaft out of a later model...would it be a direct swap? any years better than others?
didnt notice if the t-case had been dropped when i was under there (if not it will be). the t-case is a NP207. im not sure, but im thinkin the frontend is a dana 30?
i appreciate all the info i get from you guys...an who knows...maybe someday you'll need some help on an ol Mopar! (my speciality)

540demon

lemme make sure ive clearly described what i have. It must be the GKN? style....the joint is covered by a rubber boot. im thinking i would need a double cardian (2 u-joints side by side) to help compensate for the stiff angle.
so, will it swap without alot of drama?