Having worked at many dealers I would say take it to the same one. I know it's frustrating. If you haven't already sat down with the service manager/general manager and expressed your frustration I would do so.
Sent from my SM-N910T using WAYALIFE mobile app