I'd strongly suggest Detention, Higher Education or any of the newer instructional DVDs out there. Money well spent, as they take you from beginner to moves where an old guy like me can't even follow the rotation when in slow motion.
My warm up is always to go out just to the edge of the foam/whitewash (about like ten feet or so) and very slowly and smoothly roll onto the board's edge. The goal is to keep it slow and progressive and end up at the top of the wake with 1) your legs the most extended they've been, 2) the most amount of tension on the rope, 3) the most amount of speed across the wake. This isn't to say that you need to be hauling a$$ across the wake, just that you've progressively gone from straight and level to edged, loaded and extended, with all peaking right at the wake. When done correctly, it's one motion and you get enough pop to get wake to wake in a controlled way after only starting ten feet out. I do that toeside and heelside a few times and will then start out farther in the flats.
Even when you move out farther, you want that same feeling of rolling slowly & progressively into your edge but will reach a certain edge and then just hold it for a time while the speed and tension builds on the way to hitting the wake. If you roll progressively until there's a lot of tension while you're still too far outside of the wake, you'll screw yourself by having to ease up on your edge as the speed and tension builds. Much better to progressively roll into a weak edge but then hold it all the way through (it won't be a weak edge by the time you get to the wake) than to build an agressive edge early and then have to ease off as you approach the wake. In the latter case, you'll have all kinds of speed and no lift.
For me, I can tell when the boat's going too fast when I set an edge early and end up having to ease it before the wake.
Biggest thing is just make sure tension, speed and body extension are all peaked at the wake and you'll fly. If you keep your handle down at your hip and at the right location, you'll stay true in the air. Let the handle come up and you'll rotate into a header. Let go of your front hand or move the handle back across your stomach and you'll rotate in the air and either land sideways or 180 off of where you started. Now the fun part is when you let the handle rise AND let it come back across your stomach - then you start getting the off-axis front roll to faceplant.
Heelside is pretty easy in terms of handle position - start with it at the front hip, and end at the front hip to stomach or so. Toeside's harder in that the handle needs to start at the front hip and end at like the back side of the front hip (farther around your body) and usually in the air, you'll actually push the handle down lower a little to keep from being pulled over towards the boat.
Even after you get across the wake a few times, try that warmp up I described - since it's all in one motion, you clearly see the effects line tension (aka edge plus speed) on pop. You also see that you don't need to CHARGE the wake to get across. Often the more speed you carry in, the less height and control you end with.
With all that being said, I'm the last person that should be giving advice ;-) Got the edge down, though!