I'm about 3/4 through this one and considering the source material, I think it rocks. I think the only extra thing I would've done (and may when I do my edit) is take out the comic relief elements with Gimli. I haven't quite figured out how to do it, but your edit looks like a great template to start from.