When I was owner of this rifle I would build it back to original configurations ( Match rifle )
there are to many of these fine rifles that where "destroyed" to make something different.