I did a bit better this time around. As mentioned by Burb, I didn't use the whip jump glitch to clear the blocks on the water passages, so hopefully, I did it right this time.

I had bad RNG while grinding for the chain whip and some blunders near the end, but it's getting better bit by bit.