For scopes- I would read up on Burris Signature and Burris Signature Rimfire rings, both have inserts which will allow mounting adjustments on the rings to give you what you need. On a tangent, but maybe important, how did you tighten down your rings? Did you use recommended torque for both ring and base mounts? I did it the lazy way the last mounting I did and was a good foot and a half off. I remounted with a torque wrench and was an inch off.

Iron sights- I am not familiar with your iron sights, but I cannot believe there is no windage adjustments on either the front or the rear. Are you sure?