I'm going to be a bit of contrarian: many people on this board tend to always go back to gates and setup, as if every failed pass can always be traced to the set up. There's something valuable in that philosophy, but I think it gets overstated, often. Could your setup/gates/1 be a little better? sure. Is that what's stopping you? I don't think so.
To my eye, your body position from 1-to-2 is night-and-day worse than your gates-to-1. Your ass is dragging more dramatically, and as a consequence your arms end up much further from your hips, and coming through/off the wakes you crush, giving all your energy/angle back to the boat. Result: a narrow-and-fast 2 ball.
@Horton sometimes talks about trying to straighten your back leg. I think if you focused on a straighter back leg as you approach the wakes from 1-to-2, your hips would come forward and you wouldn't give so much energy back to the boat. Keep your arms tight to your vest after the wakes and I think you'll carry more of your energy outbound, setting you up for a better 2.
My 2¢.
P.S. I'm about your level (a pass ahead on a very good day), and have struggled with similar stuff. Please take my comments humbly, in that context.