Add a third strategy "waterline" that moves down in layers and in each layer follows the contour of all geometry that intersects this layer. Together with the 4-axis surface-normal following this has the potential to create very smooth surfaces.