I'd go with this costume for the movie.
I didn't read any of this thread, yet, but I am guessing they could go
with his new costume in Marvel Now. The updated version looks like
it has a big movie inspired design.

Although, looking now I see something different.
Not sure why they would go with this:

Spoiler!!! Click to Read!:

Just based on the lighting and what we can see, it doesn't look like the new suit has the ab stripes at all. Still think we're going to be getting a couple suits, with one being the more common CA pattern.