Yeah you should find an 8.25 driveshaft. The D35 has a short pinion (smaller ring gear, and smaller housing), so they used a longer driveshaft. And the YJ slip yoke with the longer ears is adding to it as well.
With only 2" lift, you would be good with a stock 8.25 driveshaft from the same generation. The YJ yoke is probably not needed, but probably not hurting anything either (better articulation)