The nice thing about manual action .22lr rifles is that they will eat ANY .22lr ammo. And if you get a Henry, it will also eat .22 short, .22 long, even the sans powder loads! Don't fret about the .22 shortage, it's pretty much over. You may have a hard time finding a particular brand or load, but you can find ammo.
That being said, I have a Winchester 94 carbine in .357 if you'd like to arrange a meeting at Kokohead some weekend. And a Henry, of course.