You're way too organized for me LOL!. I built diamonds and originally was going to make them 12" x 12" to nicely fit 16 Bordeaux bottles but decided instead to go with 13.5" x 13.5" for no particular reason at the time. Thankfully I did because I'm now using Burgundy bottles as well and the larger size fits 16 bottles with little waisted space.
Some burgs stack well in diamonds, others have a slight taper and will fall out if I stack too many, another one of the reasons for the conversion!