I went back to watch both trailers today after seeing the movie last week. One is a lot of plot points but jumbled to make it somewhat unclear (by design?). The other has what you would expect to be full scenes that I don't even recall from the movie. The full plot is not more than hinted at in either. I enjoyed the movie, and having seen a trailer didn't take away from that at all, in my experience.
Again, the disclaimer: I agree that plot revealing trailer suck. I typically avoid watching trailers in theaters by looking at my phone or whatever just to distract myself, and never watch trailers at all outside of theaters.