Problem solved by this pic? Except... I seem to remember you saying something about putting the moisture barrier on top of the overhang foam, or not at all (it hand some built in or something?)? In which case, problem is solved by removing overhang metal, foam, loosening roof and tucking...