Jay, if other than the lantern interference, the 022 switches are serving you well consider removing the lantern and seal the socket...or...flip the switch motor to the other side of the switch, an easy screw driver job...or...remove the switch motor completely and operate the offending switch from under the platform with a Tortoise style switch motor.
Definitely keep those 18" cars!