Since its an ongoing issue I would politely ask for an appointment at Costco and insist on a manager being involved. You should not have to wait since youve already been there. You should be going to the front of the line. If the shop or store manager is any good you should get squared away quickly.