My vote is for squares as I think people visualize squares better. Maybe I am just too square.
By the way, I think y'all will need to modify the 30m language to change the concept from 30m circle around the basket to an infinite zone defined on one side by an imaginary line extending from a point (defined as the center of the fairway, 30m teeside from the basket) and extending to infinity in two directions perpendicular to the line to the basket. Anything stance on the non-tee side of that line must meet the different stance rules.
The language is awkward, but logistically, TDs will only be able to mark the 30M in one spot (hopefully, the point I described) and one spot will create uncertainty using the circle concept for shots that are either way past the basket or way off to the side.