Get the warn hub kit and install. Its pretty simple. If you have done the 1 p.c.s. shafts already, you shouldn't have any problems swapping a hub kit. Your changing the stud shaft, adding a new spindle, old school wheel bearings, races, hubs, and locking nuts.
My friends D30 on his jeep, with 35's. Wheels the piss out of it. He's broken one shaft and he was running 31's. He has wheeled 33's and 35's with no issues, If I ever do a swap, I'll prob do a 44 since you're already doing the work. Why not just do the 44. But I think a 30 would hold up ok, here is my friends rig,
do know a company that sell the WARN manual locking hubs kit for the D30? and about how much they cost for the kit?
also the cj outers should be the same as the cherokee since they are both d30 the pumpkin is just on opposite sides! but if i used the outers off a cj axle( making sure they took the same u-joint size) and bought the man. hubs for it? or would i have to use the outers, hub, steering knuckles and all to use the cj man. hubs? does anyone know?