Circular vs Square ND filter

I’ve always used LEE filters, and found them well build and high quality filters.

However, light leak seem to come up too often in very long exposures (longer than 5 mins).

I’m considering the hitech 16 stop circular filter. Does anyone have experience with it, and is it more robust to light leaks?