Kind of sad the mechanic didn't notice the missing shift pin the first time. Especially after you told him about our suspicions and gave him the missing pin.
Hopefully he can figure out how to permanently install the pin or get you a whole new shift cam.
Getting a new shift cam complete with all of the pins installed is the best way to fix the problem.