I would simply bed around the butt-stock protrusion where it enters the end of the action, then glass-bed the fore stock to the front of the action and barrel. I would not use the top wooden guard, but shooting with and without will show if it effects accuracy.

Oft times, the crown is not square to the bore - and needs re-crowing. That might be all that is wrong - or not.

How well do you shoot other rifles with battle sights?