You can both of these rigs drop off style, the advantage being, that the lead only comes off if, it itself gets caught up, not on every take.
As stated though, I wouldn't do this using a leader, but the naked version would be fine, as if it did snap, the break will almost certainly be at the back of the knot.
I do believe in simplifying things, theres a lot of unnecessary items out, that just aren't needed.