The Wolverine is one of the most frustrating movies I have ever seen. It's 3/4s perfect.
Imagine this....movie runs as is until the samurai duel with Shingen at their home. Up to this point you're assuming he's the big bad, keep it going. And you've got the Chekov's gun of the Silver Samurai armor out there. Wolverine heads to the mountain village. You still get the fight through the ninjas, but a back-to-full-strength Logan approaching berserker rage just tears through them. (Maybe earn that R-rating.) Reaching the castle, he's ready to fight Mariko's dad, but instead finds him dead and withered, drained of his youth. That's what they were stealing from Logan, the knowledge of how his healing factor worked. And now we see old man Yashida, young again, either played by Yamamura if they go all the way back, or maybe even played by Sanada, middle-aged, as the Silver Samurai. Now you get the bad ass 1v1 samurai fight as the big closer, instead of the stupid CGI robot battle. You could even have had Yukio give Logan the Yashida colors right before he heads to the mountains.
Bottom line....this was 100 minutes of an almost-intimate character film that didn't deserve to end in a misplaced CGI fest.