You said you talked to Surly for 30 minutes, WTF did you discuss? just because someone is the same height or inseam doesn't mean that their choice of bike size is right for you.If you have been riding for years you should have a bike that fits you now.
Get a protractor, a yardstick and 2 large pieces of poster board taped together .Take the dimensions off your current bike's frame from the center of the bottom bracket and plot them on the poster board.Also draw out the profile of your stem and the seat post including the location of the clamp. Draw out the pedal circle also so you can check the KOP position.
Then take the advertised Surly dimensions from the 50 cm( the 50 is closest to your inseam )and plot them over the lines from your current bike. if the lines are close enough to compensate with seat posts and stems you are in business. if not, go up or down a size to get one that is close.
There isn't a good ice cream bar in Mindenville NY