Definitely get the 10/22. I put a heavy weight 16" barrel on mine, its great. 10/22s are so easy to find and so easy to get aftermarket bits and pieces for.
My action is worn out, I plan to like-for-like swap it for a better action one day, just haven't gotten around to it.
While your doing to your cat C forms do it for shotgun as well. I got cat C put on my license in 2016, bought the 10/22 straight away but didn't end up buying a shotgun until 2018. Now I probably use the shotgun more