The rifle looks very nice! If you're planning to keep the two-piece 'scope mounts, I would buy one of these arrestor blocks if I were you.
Agree with I.J. about the 'wings' on the safety slide - I shaped a bit of wood to fit the spring compressor so it would bear on the centre of the slide, with cutouts to protect the wings.