tony
you're still shrugging in front of your center of mass, meaning you're not using hip extension; hip extension is the primary force that imparts vertical momentum to the bar
watch where these guys finish their pull and shrug:
all of them finish their pull just slightly to the rear, but mostly straight up, which is exactly how the extension should look
you're doing a better job of "waiting" for the second pull, now all you have to do is "finish" it by driving your hips all the way through; this is what extends your torso upwards as your shoulders come in line with the hips and heels
finishing the pull straight up and slightly behind will also solve most of the problem of you catching the bar on your toes, since you're having to move forward to receive it
one last thing, you're pulling with your arms at the beginning of the second pull, sort of like a bent-over row, do not do this, keep the arms straight until after you've extended


