I prefered the first trailer, but I think they did a better job editing River's fight scene in the second one (which I believe is the one playing in theaters now).

I much prefered the ending to the first trailer, too.