I would like to change the rapido couplers on my N scale Rivarossi heavyweight passenger cars to Unimate couplers. I had some short shank couplers on hand, but they are too short. They don’t clear the car ends. Can someone tell me if I should order medium shank or long shank [Red Caboose] Unimates?