If it were me, I would take a hi-res pic or two of the needed parts against an accurate ruler with notations for post & nut thread sizes. Then email that to Jeff at Train Tender along with the part numbers from Olsen's manual for consultation.
Most larger hardware stores have a thread sizing "plaque" in their nut and screw section. Smaller hardware stores may have assorted specialty screws and nuts that you can compare against your parts to determine thread size & pitch.
I would suspect the 022 postwar switches were identical. I have not come across any differences. Even if there are different I suspect the motor section would be interchangeable with the switch part. Even Servoguy repair notes had anything on differences.