Rob,
Thanks for the great story. About all you can hope to do in these situations is be mentally ready for things like the return of the cross wind when the blanking effect of the hangars stops. Predicting these things takes experience and experience isn't always cheap. Just keep flying the airplane all the way and you will get the best possible result.
I have to apologize for being slow in addressing the front part of the discussion.
I also owe
Joe Perkel an attaboy

for answering the first question.
Best wishes to all,
Sid