Replacing abutment flashing on rendered wall

[4xpaws]

I need to replace the abutment flashing on my roof. The abutment wall is rendered all the way down to the double lap roof tiles. From what I can work out I need to..
Remove about 100mm of rendering above the tiles.
Fix flashing soakers.
Fix step strips of flashing into the exposed motar joints.
fix a rendering stop above the line of the stepped flashing
Render up to the rendering stop.

Is this correct?

 

[masona]

Here

 

[4xpaws]

Thanks,

there's also a chimney breast mid way along the abutment that the flashing has to go arround. How do I do the flashing around this so that standing water doesn't collect on the upper side of the chimney in the corner between the chimney and wall?

 

[masona]

Does this one helps?

 

[4xpaws]

Thanks, didn't spot page that when I looked at the site!