I strictly whip finish and I do it twice as I have found that a single whip finish after a few catches have loosen and the fly begins to unravel.
No offense, but if sounds like you need to work on your whip finishes. You should be wrapping from the back of the head forward to the eye, that may be part of your problem.

Jeremy