Why not just issue Sub-Compact Assault Rifles? Would simplify logistics enough and we know that the performance is there. The M-4 with a 10" Barrel or something akin to the HK G-36C seem pretty good. They're only marginally larger and save alot on training, supply, and spares problems you'd encounter with either the P90 or PDW.