the mag capacity is not as big of an issue as folks lead you to believe.
the 24 would be a better limited gun, but dont let me decide for you what you want to shoot.
a J-point equipped G22 with a lone wolf barrel and Jager comp would be a nice addition to the g24, and it will shoot good enough with your limited ammo to still be pretty competitive.
a top end and big stick mag and you should be good to go for both limited and open.
harmon