sounds like it could be the chainring that is the problem. I would ask the shop to toss a new large chainring on and then see if that fixes it. Alternately, it sounds like they have been doing whatever the simplest fix might be and then handing you the bike back. Next time, maybe leave it with them and then before going to pick it up ask them if they are sure the problem has been fixed before taking it back.