Based on the HS w2w pics on your profile, I'd say your toeside edge is likely better than your HS. Right now, you have too much line tension on HS to take one hand off to grab. . It looks like you are taking a super fast HS approach and letting off right before the wake, going more horizontal w2w vs. vertical. I'd recommend shortening the rope to 60 to 65' and taking short/slow progressive edge HS approaches to the wake. Work on going w2w with the "dead sailor" air....legs straight (bend them upon landing to protect the knees)!
Think of how you get out of the water and back onto the boat platform. You push down on your hands and extend your legs to get the upward motion that lifts you out of the water. Do the same with the wake. Hold your edge, ride up the wake, push the handle down and extend your legs. Try it and see what you think.
Once you have the hang time, then work on the grabs and as Alice said...those legs you just extended to get big pop...bring them back up and get your grab on.