The residual messiness in my last run of this wasn't sitting well with me even though I thought I wasn't going to come back to it any time soon, so here we are. As with my last run, this is largely using woe's route; the improvement is mainly in a much faster faucet ledge drop.