No reputable shop is going to give you any kind of warranty and 90% of the reputable shops wont take work that has been started on and they just finish it... The other 10% are going to charge you to redo anything you have done ... If your trying to make it nice save the money and get it done right the 1st time.... LOKEY nissan/infinitys body shop would do it but not going to be cheap ask for craig or scott ...