You could combine the two ideas you have. Buy more yardage, but use it to redo the diamond blocks. Math is not my strong point, so I can't help with the measurements, but I"m sure someone can.
You could take just the outer triangles off the block and redo those.
Lynette