Worth discussing with a certifier famaliar with your local govt area and lawyer to understand where you stand. The certifier may consider that Stage I and II must both comply when II is completed and inspected so some of your proposed options arent viable anyway. The lawyer will help explain...