All of the above is right on track! Bordeaux bottles are my bottle of choice too. I buy clear ones for all of my whites, either brown or green for my reds, and my wine cellar is designed to accommodate those size bottles.
I did build 6 racks a tad wider to accommodate commercial bottles which hardly ever seem to fit in the racks..............