I wouldn't bother with the manual hubs, the price of the kit is high and there is no real benefit unless you have a spool or welded dif. that said, to remove the CAD, you can simply run TJ front D30 shafts. there will not be a intermidiate shaft and the U-joints will be the larger, slightly stronger joints. I ran TJ shafts in my D30 for years, the only mod is you need to change the inner passenger side seal, Napa carries the part but I forget the part number. I wheeled with a welded diff, I did drive my jeep on the street on occasions, and it was not an ideal situation. if you run a detroit, or a selectable or a lunch box locker that will dissengage, you will be fine.
To get the dash light to light up, if it really matters to you, take the two wires off the CAD diaphram and put a switch between them. I never bothered, I just cut the wires out, a dash light was not that important to me.