IMHO, if you trim the pieced squares so that the points line up, you will have to do the same to the solid squares, and you would lose part of the design. Just go with it and enjoy the process. Next time make a sample block or blocks to see how they work together. I think there is a very lucky little girl in your world. It is beautiful.