FWIW, Jobo bottles are almost as good as glass for keeping properties, my year old bottle of replenished xtol is still going.
Aside from that, my preference is for square bottles since they use less shelf space.

USPLastics.com probably has some round bottles that would fit the square holes.