Correct - team Delos finds Bernard two weeks after the massacre, they take him to the encampment where he sees the security force execute some of the hosts, and then they travel to the sea (which isn't supposed to exist) and find all the other hosts dead, to which Bernard states "I killed them."
Bernard and Charlotte appear to be within 24 hours after the massacre and then they locate the bunker, where Charlotte tells Bernard of her plans and how no help will arrive until her contacts on the outside receive "the package" (Abernathy). So we have to see how all that transpires, how the sea is created, and how/why Bernard kills the hosts (or why he thinks he killed the hosts).
We have no idea when in time William shoots Young Ford or when Dolores(or is it Wyatt now?) begins executing the civilians.