Matabele,
I am in violent agreement with taw1126 and the rest of the "keep it original posters". What you have is one great rifle and as long as you do not intend to engage in precision targetry it is in my mind a no brainer. I would not even take the chance of rebarreling and keeping the original barrel as "things happen"- a good friend made that mistake (the gunsmith was far from incompetent) with a Mauser Kurz action and becomes physically ill when others talk of rebarreling an original Mauser.