Warning over 'two-year wait' for new armed anti-terror police

'Shoot to kill' police could be given greater legal protection