I think that you should keep the specialized. As another poster mentioned it's a nicer bike than the surly. Just get the brakes adjusted properly and ride the piss out of it.
Note that as the pads wear they may start chattering and have to be adjusted again.