For the rimfire I would get the Mueller APT 4.5-14X40
For your other upgrades I would recommend the Vortex line of scopes. Vortex has several price lines. The mid range product at $350-$450 is a great value.
Alpen is another good scope manufacturer. The name is not as well known as most others but they make a very nice scope. Great eye box and eye relief for the cost.