City still surveying new police HQ locations as initial deal 'no longer being considered'