One reason to go back in time and get rid of all the electrical **** is just that reason. It's electrical. If your actuator goes out on the trail, you're ****ed.
OP: I eliminated ALL of my ADD components. All you have to do it just unbolt the ADD t-case, and put in the manual one. Probably wouldnt be a bad idea to change the rear seal on the transmission, incase you mess it up taking the t-case out. As far as keeping the ADD front diff, I can't tell you how to make it still work, but you can always go the manual hub route. Easy to do. Just take the actuator off of the front diff, put a hose clamp on the actuator so it stays "engaged", and swap the knuckles to the manual ones. You're also going to need manual CVs. Took me about 2 hours to do it all.