Coastie.. If you are still reading this.. and your 2WD-4WD switch really works..
I think you would be a prime candidate for manual hubs..
I am not sure what the weird noise you have is.. but would like to hear what it WAS if you ever have it diagnosed and fixed
Jeff