A trick I learned in Substance Painter while working on my Furality outfit is a Fill Layer with Planar-Projection and using a texture in the Grayscale channel to get clean shapes in your mask.
šļø Linear Dodge for Additive Layers.
ā Subtract to Carve Shapes.
Super easy to edit and sharp lines!