What about using a dedicated 3rd "auxiliary" car behind the tender with a pickup roller? If you install a small plug the car can be easily connected and disconnected.
The easiest type of 3rd car would be an operating car or a coach that already has a pickup installed.
Have Fun
Ron