I just finished this, using a necro for underwater dashing. And raptor to finish, barely made it through.
And yes, it was very, very, very frustrating.. because it wasn`t just 1 bug..
At random my checkpoints underwater would simply not be there for me to follow.. so I had to restart, in hopes they would just be there for me to try again.