I have a Smith and Wesson model 22A. It's a very affordable 22 semi auto and I've found it to be very accurate.
I would recommend you take a look at it. I also agree that you won't go wrong with either of your choices you mentioned.