Boat Tiles Remix with OpenLock connectors

I loved the Boat tiles by ProffessorChubbs: https://www.thingiverse.com/thing:2380515
But the connectors were somewhat clunky and so I remixed it with the Openlock connector designs: https://www.printablescenery.com/product/open-lock/
I have altered the clip slightly to be more loose fitting, but it is still cross compatible with all Openlock connectors.

I have not altered the sharp corners.
There is some difficulty printing the rings on the main mast without support (see the picture, two broke).
There is difficulty printing the Helm without support (I have yet to try with support).