They better keep the headquarters it downtown, or if they relocate, it also better be in downtown.
Whatever it takes for a bigger police presence in downtown is extremely important, to me anyway. The post office location is a fine idea, IMO. Not sure how important it is for police headquarters to be linked directly to City Hall, in the greater scheme of things... so I've no problem with the post office location.
I also am a big proponent of cameras downtown... put 'em up on every street, sidewalk, back lane, etc.