I'd go with Option 2.
I'm certainly no pistoleer by any stretch of the imagination, and hopefully the more skilled guys will chime in and help you out.
I'd suggest lots, and lots, and lots of dryfire. In the past, when I've debugged various trigger problems or flinches, I've learned to like the training lasers. Slides in the chamber, sort of like a laser boresight, and whenever the striker/hammer hits the "primer" on the back...it shoots out a laser. I got one for Christmas from my wife in .45 ACP and I love it. I feel that I get more from my dryfire training with it.
You can pick a light switch, or spot on the wall, and if you see that laser appear as just a dot...great. But if that dot jerks or makes a line on the wall instead of just a dot...then you're seeing your trigger problem or a flinch. It makes dryfire training kind of fun as well
I believe they also make a LaserLyte Training Target for it, but I don't have one of those.