Check the spindle closely with the nut removed. There is usually more than one hole for the cotter pin, which allows you to split the difference between castle nut slots. The holes are at a different angle than the slots, 90 degrees apart instead of 60, IIRC. If there's not a second hole, drill one.
Jerry