Not sure where you are in upstate New York, but you might consider making a trip to Waitsfield, Vermont to Fitwerx. We spent a lot of time in their shop while we were back east a few years ago. And I was pretty impressed with their service and philosophy.

They also have a shop in MA somewhere.

Veronica