It sounds like you are progressing nicely. I wouldn't bother with crabbing for landings just yet. Just line it up with the wind and set it down as gently as you can.