the stop and dome terminals on the light switch are not affected by the switch position, always hot .... the orange wire on the stop switch has to get power someplace, maybe the fuse panel if you have one .... yes, I'd think you could change it to match the diagram, but you should find the other end of the orange wire first
Bill