If you don't already know it I would suggest the "catch the fly-line cast". I use it for almost all my fly line retrieves during fishing. The fly line is essentially left out of the rod tip and you can do whatever is necessary to the leader end, be it fly inspection, fly change, wind knots or whatever.
The cast goes something like this: Make a lazy back cast over your left shoulder with at least 10 to twenty ft. of fly line and catch the fly line in your hand. Next, flip the rod forward and stop the line as you feel the leader in your hand. Your in business! To rig the rod to move to the next hole I put the fly in the stripping guide and wrap the leader around the butt of the rod then finger the remaining line to the rod grip and reel up.
If the fly line is at the tip guide it is a sure sign to me that I'm headed home.
Also, when reeling in if the fly line fouls at the rod tip, the tip is bouncing. To avoid this, hold the tip against something. Like against a bush, the grass,a fishing partner, in the water, whatever is convenient. Hope this helps you.
"As far down the river as he could see, the trout were rising, making circles on the surface of the water, as though it were starting to rain."- E.H., The Big Two Hearted River