That sounds good.
I'm going to have to bring the whole control panel down to you though because I have no idea how to get that stick out of there without being able to remove the knob, or even if it is possible for it to come out without removing the knob. It is a shame to destroy the knob on it to get the stick out of the CP but is there any other option?
Also, do you have a rotary switch wire harness to go with the LS-30 you found? The one that is already there can't be reused on the replacement stick because each wire is soldered directly to the pins on the rotary switch, instead of having a connector like the later LS-30's have.