p14 cocking piece safety issues

[aletheuo]

Pictured above is the bolt assembly without spring showing the final position of the cocking piece as close to the head of the bolt as possible. The firing pin must be limiting travel.
Looks like I probably need a whole new bolt body or have someone perhaps add a bit of material into it without affecting it's head treat if that's at all possible.
Bolt lock is also missing and there wasn't a hole drilled in the new handle either so that needs to be done.
Firing pin protrusion is about 90 thou - Assuming that's the complete travel possible as there's nothing under the cocking piece to prevent it from going further that way.

So, am I in for a new bolt body and cocking piece? Also, is the handle just soldered on usually? Kinda looks that way. I'll def need a straight one to fit in the stock.

Jamie