Boss level at the end of sections could definitely work, could also maybe spread out the mechanics? Or indeed add more a la Celeste, there's potential for loads.
With the bug, I just remember going to the surface of the ocean, seeing the ship, and then it panning down, after maybe 5 seconds it started looping, so camera back up to the first shot of the boat, then back down and so on. No further issues