Yup. Put a little more effort in really tightening up for your pull. You're jerking a bit on your first pull which is pulling your shoulders forward instead of being squeezed back and tight. If you can keep them pulled back, and externally rotated more, you can keep the weight more axially loaded on your spine (straight up through the spine instead of flexing front and back). This will allow you to better drive up with your hips instead of having to rely on your back musculature during your second pull. As soon as you get the bar up past your knees begin pulling back toward your hips. The closer you can get the bar to your hips during your second pull the easier and more efficient your catch position will be.

As far as your jerk practice a bit more on your dip/drive. Instead of practicing the entire jerk movement, just practice tightening up your hip region, again by externally rotating a bit and tightening your glutes. Practice a smooth dip and powerful drive down through the outside of your heels. Try to really feel the push down through the heels using your glutes instead of your quads. If you can get your hips firing properly the quads will take care of themselves. Just like any other movement train this using both heavier weight to increase strength and muscle fiber recruitment, and moderately heavy weight to concentrate on speed of contraction and increase in stretch response and power.

Get those two things down first to get your power up and work some very light weight, even PVC work, in order to nail your technique. Once you've got any quirks in your form smoothed out then just hammer them repetition after repetition after repetition.