The spring can be replaced by most any good gunsmith. That would take care of the leaf problem.

It sounds as though you need a higher front sight. Again, talk to a good smithy, and he should be able to take care of that for you.

Welcome to the forum.