Windows leak, roof leaks.... what next?

[NONHOG]

So my shop is an ongoing project. Its not too old. Now the dang roof is leaking. And........... the rear windows are leaking. I'm thinking with the wind and heavy rain it was pushing in past the J channel on the rear windows?

The roof I really don't know. Once it gets dry I'll crawl up there and have a look-see. It leaked a few months ago and I figured it was due to a fir needle dam. It stopped but now was leaking worse. We did have a couple inches of rain over the weekend. Regardless it shouldn't leak!

Not yet sure how to attack this. Been years and never leaked before. That I recall. Except when it was snowing sideways it pushed in. I added closure strips and some great stuff and ended that. I have to wonder how a pro would handle this. If my builder was around I'd ask them. They are not.