I was just getting ready to reply and saw that Brendan nailed it. If you are planning on switching operations, you have two choices. Live with the short comings of Flyer style couplers or use Kadee's.
At some point the hand will have to get involved. Even the most serious of model railroaders (the time table and train order ones)] use some type of skewer for uncoupling operations.
I tried switching operations with Flyer couplers and well I thought there has to be a better way.
If I was younger and had better vision and steady hands, I would switch to Kadee's. You seem to have a modest fleet so it would not be overwhelming.
I still think in S high rail wheels and Kadee's is the way to go.