Made some difficult parts less tedious

I want this game to be challenging, but also rewarding. There were a few sections (the water part) where it was challenging, but also very tedious, throwing off the balance of difficulty to reward that I wanted. I reworked that section to make it more fun.

Also I reorganized the challenges in the ending section so that there is more of a skill curve instead of having the hardest ones first. I think it feels a bit better now.