I think the officer's choice is a good idea. I think that a person, especially someone with a reasonable expectation to have to use a firearm, should be allowed to carry something comfortable for them.
I do think that a unified policy for SWAT, SOG, whatever, teams is also reasonable because...