Tom, I have a shooter, as do you. I replaced the front sight with a Mauser 98K and filed a square slot in the rear sight. Makes my "old" eyes see the sights a lot better. I had to shoot and file the front sight to bring the fired group to the point of aim.
I kept the original front and rear toggle and replaced them with the parts I modified.
Works great!!