Your description of the bolt modification is almost exactly what I did on my '17 Enfield. The knob on the end of the bolt lever was hacksawed off, then the bolt was packed in wet rags & a torch was applied to the dogleg which was bent to more pleasing shape. The end of the moderately straightened bolt lever was filed down to fit inside the hollow end of the original bolt lever knob which was then welded back on. Ended up with the bolt lever shortened by about 1/2" & bent to my satisfaction.
I spent a year building that rifle & it gives me great pleasure every time I take it to the range.
Trigger control + Breath control + Sight alignment = Gun Control.
NRA Smallbore Prone Master, High Power Master