Personally I don't mind trailers revealing main story beats, as that is the norm by this point.
It is nice that Civil War hasn't shown us Zemo (although that could be an indication of how involved he is in the film) but lets not forget that both avengers films were spoiled by the trailers in the exact same way as what BvS showed.