If you have practiced draw, rack and fire, then you need to practice draw and fire. This can be done just in dry fire practice at home. Unloaded is preferable

, leave the mag in another room. Also a great time for practicing sight transition. Pick a point on a threatening plant or mean teddy bear and lock your focus, draw, and as the sights come into your sight line to target, start your squeeze as you shift focus/acquire the front sight.
The mind is funny thing about repetition, even when new information is added about a new or different way to do things, it will often default under stress or as a matter of reflex. I used to have a very nice Browning pump shotgun. The only thing I didn't like was the thumb activated safety, exactly like a Mossberg. Growing up all I'd shot was Remington 870's and still do. The Browning had been out 5-6 times for sporting clays or informal clay shooting but when I decided to give it a try at dove hunting, things didn't go so well. I had spooked a pair out of a drywash, I started my swing as I mounted the gun, it came to shoulder, I got my lead and pulled...nothing....I pulled again and then fingered the safety. The safety was on. And it wasn't on the trigger guard. The 12 plus years of duck, dove, pheasant and rabbit hunting..plus sporting clays with an 870...I wasn't going to change that ingrained handling with half a dozen outings with the Browning. I decided to sell it, there wasn't anything it did better than an 870, it just looked pretty doing it.
One thing you may run into, and the reason I don't like Glocks, is the grip angle. Take a look at the palm of your hand. Starting just below the knuckle of your index finger, between it and the web of your thumb, there is a crease that runs at an angle to the outer edge of your hand. The angle formed by that crease and your index finger is the 1911 grip angle. The reason is simple. When you extend your arm to point at something, the grip angle is such that it naturally aligns the barrel where you are pointing. Shotgunners for centuries have known how to take advantage of natural point of aim. Custom fitting of a shotgun is nothing more than adjusting the stock length, comb drop and cast so that when mounted the barrel is directly in line with your eye. The very act of mounting the shotgun also "aims" it. This means it will shoot where you are looking. Now, take your Glock. Pick a point on the wall and focus on it. Start with the Glock hanging at your side with a good grip and your index finger pointing along the side. Close your eyes and raise the Glock to your focal point. Freeze your arm and open your eyes. Any handgun that fits you should have the sights aligned by this simple action. On the Glock, instead of seeing that front sight nestled into the rear, most likely you will be seeing the rear sight, the top of the slide and the front sight. It will be pointing up.You'll see the same thing with Luger's and Ruger .22's. That bastard of a grip has probably saved countless lives of those on the wrong side of the gun. I am a firm believer in fitting firearms to the users natural point of aim. I need hits and I need them as easy and as natural as pointing at my target. That's not to say don't use the sights, but a small correction is all that should be needed when it's brought to target.
Personally, I want a manual safety. I'd get an XD or search "Robar Glock" for information on a grip reduction to correct the grip angle. There is also a kit to add a manual, frame mounted safety to a Glock. It only requires a small notch be cut in the frame. The addition of a safety is the only way I would consider a reduction in trigger pull, from both a legal and a safety standpoint.
Carry the way you are comfortable, whether it's condition 1 or 2, just practice it. I think it was the Israeli's that did the draw rack and fire...the point is that you can learn to do that just as fast as most people can draw. Yes, there are situations that it will be a definite hindrance or outright deadly to carry condition 2, but then again you are always at a disadvantage when REACTING to a threat. I think the addition of a safety would ease your concerns about condition 1 carry and add a level of safety against NGs, a disarming or unauthorized handling.