The Enterprise coming out of the water happens at a different point in the movie. I saw the 10 minute IMAX preview and they were hiding the Enterprise underwater on some mission so to not break to prime directive. It's been noted on a few sites, but I'm pretty sure that's not the Enterprise that crashes into the bay. Warp nacelles are significantly smaller.