From what I have learned the TJ will be LP and not a great choice. I would go to car-parts.com and find a D30 with 4.10’s and for the rear I would go with the 8.8 with disc brakes or the 8.25. And I would agree to leave the D35 alone. You can find most of your axles at a fair price on car-parts.com
Good Luck
Watson