As a fellow Range Master I think you are on the right track.
Don't forget to order at least 10-20 additional Glocks, or more. Remember, if anyone has a shooting, or they break, for any reason, or are lost or stolen, why wait for its return from Glock, the court, the Crime lab, the property room. etc etc. Re-issue another until the other ones come back. We had this problem when we had Beretta's. Small department (less than 20 officers), major shootout, 12 of 20 officers fired their weapons. All seized by the D.A. and sent to the crime lab. No replacements. For 3 weeks we carried whatever they could bring with them in whatever holster they could find. Colt .45's, Browning Hi-Powers, mini glocks, Officers model .45's, even a MkIII Colt Trooper. They all worked, but it was a mish-mash of weapons to be sure.
Glock 22's have served us well. If I had it to do all over, I would get Glock 22's and 23's both. 22's for street, 23's for detectives/admin personnel.
FWIW