I would also just use full squares for the brown. Don't trim the excess until you are sure that you will preserve the points. For the one in the inside corner, I would create an hourglass block using all brown fabric, but just omit one of the triangles.