Are you seriously spending all that money on bedliner and bondo but you won't spend $4 to repair the studs in the flares when they break?
You are wasting your money and time. Fix the body right or just let it rot away.
I prefer name brand break in oil. Royal Purple or Lucas are the ones I use the most. Don't use a break in additive. There is always the chance it won't mix right and wipe out a cam lobe.
A TJ dash will be to narrow and the dash top will not follow the contour of the windshield. A XJ dash swap is practically a bolt in affair. It just takes some time. There is a 97+ swap write up in the DIY section.
84 XJ, sold
94 XJ, sold
86 MJ, sold
86 MJ, owned this one twice, Project Black Betty
89 MJ, owned this one twice, Project Onyx
00 XJ, sold
04 WJ, lost in divorce
06 LJ, lost in divorce
20+ parts X/Z/MJs