Hmmm... Pierce worm drive sounds like a cool option for the winch.
I think that the choices for your build are spot on considering your criteria. You will get the majority of trail capability increase from the rear locker and, in my opinion, the Discovery in stock form is quite capable of anything you wish to tackle. You may reconsider the swaybar disconnects after you have installed the HD springs but that is the beauty of the whole process. Nothing need be carved in stone, if you try it and don't like it, then change it.