Couple of things that helped me:
1. Sail overpowered (if you have the chance!)
2. Wait longer before take off, and make sure the sail is fully powered up, so push with the back hand..also try to carve upwind more before take off
3. Sail more in front rather than behind you after ducking
4. In the air put sail as far forward as possible, sheet in with back hand loads and tuck up legs.. (same as SW kono)
Essentially you need to be landing past that certain point, where the sail is forward enough to go into the upwind 360. I think it all comes down to getting height in the move, if you get height and you rotate properly you will get past that point.
Probably you have nailed them since you posted anyway!!