Luffy getting hurt is fine in a genuine way....not because he lost himself in anger etc. Let him be serious and get hurt in a way without forgetting his powers
-Hype up Apoo in his introduction
-Have Apoo not be defeated by either Zoro or Luffy
-Have Kidd take out Apoo or at least attempt to
Compromising consistency and neglecting the fact that Luffy should learn from his past and be more calm and composed and have his future sight on was one way to go about it. Can't say I blame him too much for that.