I am in the exact same predicament right now. In fact, if you remember a while back at another marina, I hit the guy next to me and it cost me 1200 bucks. Same situation, windward, no dock in between, but now I have a dock pole where the old finger used to be, long since rotted away. I watched countless boats today come in and out of their slips, all over the place, the wind wrecking havoc on them. Same problem, you get the bow in, hit reverse and the stern swings out. With two people its an easy fix. Have the other person jump off the bow, hold the bow on the cleat, don't pull the bow! very important not to pull or it will kick the stern out. Make sure they know that they are not stopping the boat, you are doing that with reverse, they are just guiding it. Then tell them to take a turn on the cleat. When they are doing that, you should be going in reverse with the wheel turned all the way to port. This will suck the stern up against the finger. Then either you can step off and tie the stern, or the bowman can come back and take the line. On windward, you have to come in fast enough to counter the wind, but not so fast that you will lose control when you try to reverse. You may know all this already, so I apologize if I am overstating. Even though I know how to do it, I can't always make it happen. When its blowing 15 to 20 at the dock, sometimes you just look like a rookie no matter what you do. If you had a pole in between you could tie a line to the dock from the pole to keep you away. That is my next project, also to add dock cleats. This marina is so damn old they don't have cleats. You think you got it hard!
Also, try coming in going upwind. you can go a little slower that way and the momentum of the boat will push the stern into the dock. Get a couple of those big round orange fenders for starboard too.