I'm going to fix a couple ugly prior fixes by my previous homeowner. On the first one, I plan to pull the siding off, pull back shingles, step flash, and then trim the siding so that it is 2" or so off the roof. I foresee two issues: I'm not sure what to do when I get to the bottom right corner of the window sill and since this is a brick home, there are firring strips behind the siding. If the siding sits off the roof, there will be a gap the thickness of the strips between the j-channel and the wall. Should I just add a counter flashing under the j-channel and over the step flashing?
In the second pic, I assume this too, should be some sort of counter flashing?