Series 11 Trailer Breakdown by Episode/Filming Block

First, the new Doctor Who Series 11 Trailer:

Block 1, Episodes 1 and 7:

Episode 1:

The Doctor in a cave

The Doctor, startled, rising abruptly.

These two scenes are believed to be of the Doctor constructing her new sonic screwdriver. Note she is still wearing the twelfth Doctor's vest and shirt. Some photos from this scene of the Doctor constructing the sonic screwdriver were leaked.

Chris Chibnall had this to say about the new sonic screwdriver at San Diego Comic Con:

"There's a very specific way this Doctor comes by this sonic screwdriver." 

"It's made out of some interesting components which you'll find out about in Episode 1."

Block 2, Episodes 2 and 3

Episode 2:

This episode features aliens in a desolate landscape, likely another world. These scenes were filmed at Macassar Beach Pavilion, an abandoned water park near Cape Town, South Africa.

The Doctor, Graham, Yasmin and Ryan climb a sandy slope with some ruins.

Graham, Yamin, Ryan and the Doctor look out on the ocean from some ruins.

Here are two scenes which contain the actor Shaun Dooley which I believe are from the same episode.

Episode 3:

An episode set during the 1955 Montgomery, Alabama Bus Boycott and the events with Rosa Parks which led up to it. This episode also features scenes filmed in South Africa, mostly in Cape Town. Note the Doctor's costume variation, a burgundy shirt instead of navy blue.

Block 3, Episodes 4 and 6:

This is the block which contained the much-covered filming in Gosport and Sheffield in February. Alan Cumming is playing Kings James the First in one of the episodes which features witches in the 17th Century. The other episode features at least one spider but it is unclear whether the episode is about spiders.

I can tell this still is from Block 3 because Tosin Cole and Bradley Walsh are wearing the same costumes from the Sheffield filming photos.

Block 4, Episodes 5 and 8:

Not enough is known about this filming block to place any stills from the trailer.

Block 5, Episodes 9 and 10:

Some of the filming from this block took place in Granada Province, Andalucia, Spain.

There were local horse riders hired for scenes for the Spain filming. Note one of the them holds a gun.

The rest of the stills I cannot yet place:

These scenes were likely filmed in a quarry. 

This may be from Block 1 filming in a forest on November 16.