I think I would remove the shingle tips projecting from the dormer base. the flash would typically cover this part. One tip is to imagine how water will run down and NOT get under the shingles, etc.

Pass no temptation lightly by, for one never knows when it may pass again!