locking latch

Has anyone found a metal locking latch for the Gen 2? I feel like the plastic one is gonna break off at some point. Also wanting to know if any butt pads were made for Gen 2 yet?