Unless you are doing quilt as you go then do option #2. For exactly the reasons you state. It will be very difficult and probably very frustrating to attempt to assemble the blocks into a quilt and to ensure you have a nice square quilt if the blocks have trapunto already done prior to assembly.