Yeah, when I replayed the game, I was confounded by the difficulty of the Carry Armor battle. I could swear it hadn't been so problematic my first playthrough.