I agree with the slip on butt pad. I have two of them. They are Buttler Creek size medium. Well worth the $15 plus tax I paid for them.
For the windage I would suggest trying for a group. If the group at 25 yards is close together then use a drift punch, and mallet to drift the sight towads the direction of the center of the group. If you want to realign the sight to where it was when you started there should be a line on the front of it to line it back up.
No matter how many times you do it and nothing happens it only takes something going wrong one time to kill you.