Hope everything works out. I personally think you are better off with an experienced upholstry shop working on the top than the techs at the dealership that have never touched a top frame/mechanism. The "craftsman" that did my friends Packard Roadster top was an absolute magician!
Friend of mine pre ordered a 350Z before they released. He had issues with the front alignment from the factory and the dealership here replaced both his front tires if I remember correctly. No reason for a car with under 3k on it to ruin a tire.
Best of luck!
__________________
'10 ZR Black Cherry Sport/Touring/Nav, Swift Springs, Stillen G3s, 15mm-F 20mm-R Spacers, SPC, Spoiler Solutions Rear Wing, Stubby Antenna