My take -- 21H in either carbine / rifle, 21F full stock all with no integral mounts but sometimes claw mounts.
22H in either carbine / rifle, 22F full stock all with integral mounts. All models were a small ring, standard length Mauser, could be had with either DTSs similliar in design to the Oberndorf Mauser(integral to the bottom metal) / single trigger. All could be had with either a butter knife / round bolt handle. A factory scope could be ordered with the 22 series and possibly the 21 but I have never run across one, I think cost kept the combos in the rare category.
The switch from 21 to 22 came around 1953. Mine is a 22H made in 1954-integral mounts with factory scope. FWIW - TTBOMK
