Sherlock, I see no reason to change the NSS if it's functioning OK, but if you DO elect to change it because of it's age I would definitely do the two switches one at a time, getting the first one fully adjusted and functioning right before taking the second one off. It makes no sense to be chasing two adjustable devices in the same circuit, trying to figure out which is the reason for your no crank status.

