Timing sprockets locking pin

I just can't find the original pins for the timing sprockets of my 400i. There were two pins: one perfectly round, the other "assymetric" to be installed next to the symetric one for additional safety. Both had a thread hole which made removal a breeze.

The new pins I've sourced 9 years ago are only symetric (was either Superformance or Eurospares) , without threaded hole. Also, metal was of lesser quality than originals. Superformance do now offer threaded pin (ref 4146769) , but only symetric.

I've disasembled the engine so many times that I'd rather replace the pins by new ones during the next timing adjustment.