I kinda go with 1 myself. Try to train the weakness. Then use assistance exercises to "build up" the problem areas, or problem portions of the movement that could lead to "ambush."
Sometimes I mess things up, and do the work that leads me right down the path to the ambush. I'm trying to get a little smarter.