I think Mesh may be your best option, I have a Mesh too, you would think that they could include a couple of spare rails with the systems as they have gone down the "toolless" road. Still your lucky to get your software let alone spare parts.
Surface Pro (2017) vs Surface Pro 4
20 groundbreaking 3D animation technologies coming to Siggraph 2017
iPad Pro 12.9 vs Surface Pro 5
Synology invites you to visit them at Insomnia on 26th – 29th August. Book your tickets now and visit Synology.