lucky you had a building lawyer check it out. totally agree with you on this. they only can pay up to the stage completed. i have build numerous times before.
i normally used the HIA standard building contract that is compliant in terms of base, frame, lockup, fixing, completion stage...