Detail 2 but use Yellow as full filled cavity insulation (mineral).
Otherwise you will have a massive thermal bridge. This is a standard detail.
The doors should be moved left on the brick and the frame should overlap the cavity insulation at least 20mm for building regs.