That's the factory D35/D30 right? 2.5l?
I ran pretty much that same setup in a YJ. Use a limited slip in the rear or keep it open. Unless you go to the Super35 kit, it won't last very long with those tires and a locker. You've got the big joints in the front axle already, so that's where you want the locker if you have to have one. I'd still plan on upgrading to nicer shafts, but at least with the big joints you'll probably get by with the factory ones for awhile. DON'T shock load it(dump the clutch) while in 4-low! It can still be broken pretty easily, but as long as you don't abuse them the factory axles can live with that setup.