Speaking of Tokyo Disneyland, after re-watching a video of their updated ride it looks like while they kept the natives, the cannibal angle was dropped. The skulls that lined the roof of the pavilion are gone as are the ones that were stacked on the boats. They still "attack" you, but it's more like because they see you as a threat and not another meal. Like how Trader Sam there no longer holds shrunken heads, it was another way to soften their depiction. It's likely most would have seen that as a half-hearted measure if done Stateside vs the wholesale replacement that was chosen.
I think I prefer the Native dance/attack scene if only because of the elaborate costume and set design and the fact that it's clearly distinct from the other vignettes in the ride, event though I understand why people think it's cringe. The monkeys on the boat/boxes are fine, but a bit repetitive after the similar scene involving the camp earlier.