You already have a border on the pieced blocks. Trim them to the same size and then trim the one-piece blocks to that size, also. Even if you have to cut 1/2 inch off some of them, that doesn't seem like a lot of waste or a big deal. Go for it.
Happy quilting.