Yes. as you know, you are losing your angle and releasing the lag too soon.
Do This:
Take your backswing and go to the top, then, as you begin your downswing, invision that you are pointing the butt end of the club down the ball to target line. This will hold your angle and allow you to hit crisp shots.
Do this slowly at first.