I agree with your approach. Even if the ignition switch turns out not to be the main culprit ... it is good maintenance practice to replace it after several thousand miles service. ... as they do fail! And it gives you a chance to lube up the rod and the key tumbler.