Potential metal roof leak

We have a metal roof as our porch roof with rain water dripping down in front of windows beneath this roof. This has happened 4 times since we moved into the house in July 2019 (new construction). The general contractor doesn’t think the issue is the window above the metal roof. We had several metal roof panels replaced in the spring of this year due to damage during installation of a missing kickout flashing. It was suspected that the roof flashing didn’t go up high enough to overlap with the window flashing so wind driven rain could allow water to enter and this was the cause of our previous water issues (separate issue from missing kickout flashing). We hadn’t had any issues that we knew of from April of this year until earlier this month during a big rain storm. This issue happened again. The roofer came out and supposedly sealed up some areas around the z channel flashings (I think this is what they’re called) so now no longer thinks the roof is the issue. I’m wondering if someone can weigh in on this issue and if the areas were sealed properly. It doesn’t look very cleanly done to us, but we are not experts.

I have added pictures of where the rain water is seen dripping down, what the front of the house looked like in the spring during replacement of the metal panels, what the new panels looked like during installation and a view of the window above the roof and flashing, what the roof looks like now after the roofer has been back out, and a view of what the water looks like coming down the window beneath the metal roof (view from inside the house)

This may be a dumb question, but can you clarify what the Z cleat is? It is my understanding that they installed that Zip system flashing to seal the metal roof flashing and the butyl flashing and then reapplied the window trim board. What you're saying is the butyl flashing should go over the metal roof flashing?

Todd-- am I able to email you to ask you more questions? Thanks.

Is this what you’re referencing, the circled area? This is from the installation guide I was able to find. We have see where the side wall trim doesn’t fold over the zee panel in spots and this is directly above where the rain water has been seen dripping down

This is what I meant to post—the end wall trim instead of the sidewall trim, highlighting what should be overlapping.

Is the circled area where you're referencing things aren't overlapping or locked as they should be?

Thank you for your insight. I'm suspecting poor installation as I am not sure why they wouldn't hook the end wall flashing over the z channel. It is hooked over in some spots but not all.