I like your presentation there cave mapper, that is very simple to follow and I'd do exactly as you do (with much shorter knots if I could reach) though I use the triple split for as much as I can, seems sensible to me when you're clipping the rope into it anyway and I'd use a fig 8 for it too, as I see that as a stronger knot than a butterfly and although for two bolts to pop it must be a big fall or some very bouncy heavyweight prusikking.
As for connecting a cowstail, I certainly wouldn't clip between the last two bolts. If you fell and were stopped by the karabiner you've fallen as far as clipping in to the loop of the last butterfly without the risk of the karabiners not jamming and you continuing to the bottom, so I don't see a plus point to clipping into the single strand between the last two knots, which is the place most people say is the worst, and I agree. Easily done when you get to the top of a long pitch though.
If it were possible depending on the pitch, I'd clip into the bolts, rather than the loops, loops rather than the line and line rather than nothing.