| I use the bowline a lot at work (non-kernmantle) but avoid using it recreationally, even the double with backup, however I'd not thought to run the tail back as per your diagram, nice, just shows, 30 years of rigging/climbing and still learning! 
 May try that with a half hitch rather than the water knot!
 
 Can't quite make out what they've done with the Yosemite?
 |