I had a similar situation recently. I added a border the same color around each block in varying sizes, then cut the blocks all to the same size. I added sashing and borders and it all came together nicely in the end.
Here's a pic so you can see. Not very good, but the better one is on my other computer.