If you still haven’t solved this I had my original ones rebuilt by Brake and Equipment Warehouse in Minneapolis. They’ve done three sets for me on 3 different cars. Might save you some headaches.
One thing I always do in addition to bagging and tagging is taking photos and videos of any complex disassembly like glass, etc. When I tag them, I also date them, so that I can go back to the dated pictures to see what I was working on when I took it apart. It’s helped more than once.
Note...