Our garage door wraps have been nicked/damaged several times, to the point that I have begun replacing, also they must have been originally installed in the winter as such every summer I see wavy aluminum that essentially has no remedy. I intend to replace with Azek/PVC Brickmoulding instead since in my opinion it is inevitable they are sacrificial as its a high wear area. However when initially built, the aluminum wraps were installed behind the vinyl siding and stone/concrete board where applicable. I can get the vinyl off if I want to, but certainly not the cultured stone. Our 2-stall door is completely cultured stone surround. Working on the 1-stall currently

Im trying to figure out the best approach here for flashing/waterproofing. I tore the door jambs off (2×6’s) then scored/cut the aluminum. My first attempt is to get some trim coil “behind” the original remaining aluminum that was considered the flashing, then cover with brickmould such to attempt to “flash” this correctly. On top of door, I am doing the same with some aluminum drip edge that will be tucked behind whats left of the original aluminum jamb wrap, and will cover the brickmould.

Attached are photos explaining what I have going now (at least on the sides).

Thank you all in advance!