Naughty Dog has admitted that the final boss battle was the weakest part of the game and that they want to start working on the boss earlier in development for the next game. It was sort of a consequence of starting work on the boss battle late in development compared to everything else and not being able to give it the time they wanted to tweak it and really get it right.