+1 on the fitter.

But having said that... I've been exactly where you are, with a 50cm Surly CC. Changing to a 60mm 35 degree rise stem was possibly the most significant and effective of the various changes made to shorten the reach. The other was changing to handlebars with shorter reach (also shallower drop and narrower width).

Details and pics here.

Hope you get things sorted and get back to enjoying those miles...