The OP said he had a fair idea of the wind direction so all turn should be in the expected runway into wind.
I don't really see what the problem is unless it is airmanship and situational awareness.
If you try to write rules for every possibility then you end up with Aussie Rules! No thank you.