Yes, welcome to NE!
I think you will find something like a kickeez pad will help.
Also, if you are reloading, you could load up light loads with cast bullets which saves $$$ and your shoulder.
I still have to change the safety on my No.1s. Don't know if you have jacked your thumb on yours or not but that seems to be a worthwhile alteration as well.