I am a resident of Long Island. I would go to Marty Fitzhenry or George Galyo (AKA GGG). Both are certified MTH techs. There are no certified techs on Long Island that I know of. Marty is in Massachusetts and George is in Virginia.
To save on postage, I remove the bodies from the engine and tender. Also take the battery out.