Converting new style FP to previous style

[Rivethead]

Since my recent post about problems with light strikes and primer blanking, I have aquired an old style firing pin assembly to replace the newer style one piece firing pin with rear springs. But it doesn't quite work.

From the schematic it seems I also need a "cocking piece sleeve".
1.Are there any other parts I need or that are different from the new design?
2.Will my existing BAS and "Cocking Piece Pin" work with the new setup?.
3.What keeps the Cocking Piece Pin from falling out?

Hopefully I can get this to work and adjust the FP protrusion down. If this doesn't fix the blanking then I will get a PTG bolt head.

Thanks

ETA I have the top bolt release and no cocking indicator thru my BAS.