Thank goodness - it appears you're on the right track now. If your replacement front pad doesn't solve the issue to your satisfaction I've got another I could send you (gratis). the other one I have I believe to be an armourer's replacement for his field kit - the "meat" of the front spigot is a little more generous and has latitude to offer more adjustment options when hand fitted.
Jim